[PATCH] ./tools/wineconf *correct (.diff) format*

[Speeddymon]

ok, I'm re-posting these in .diff format so they will
actually be committed...

this fixes not finding supermount cdroms, fixes
finding non-supermount cdroms mounted at /cdrom, fixes
not finding ntfs-based win2k partition (but i wouldn't
recommend using any programs on that partition if you
have read/write turned on in your kernel unless you
want to have to fix a corrupted partition), read the
changelog/notes in each file

This patch can be applied to LGPL, X11, CodeWeavers,
and TransGaming forks without restriction.

Here it is

__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/
-------------- next part --------------
Index: wineconf
Name: tools_wineconf-dnavea-patch
ChangeLog: find ntfs drives
ChangeLog: find supermount cd-roms
ChangeLog: fix find non-supermount cd-roms mounted at /cdrom
License: LGPL/X11/CodeWeavers/TransGaming
ModifiedFiles: tools/wineconf
===================================================================
RCS file: /home/wine/wine/tools/wineconf,v
retrieving revision 1.12
diff -u -r1.12 wineconf
--- wineconf	10 Mar 2002 00:24:22 -0000	1.12
+++ wineconf	17 Apr 2002 23:00:51 -0000
@@ -93,13 +93,20 @@
 
 	my ($device, $mntpoint, $type, @rest) = split(' ', $_);
 	if ($device !~ m"^/dev/fd") {
-	    if ($type eq "msdos" || $type eq "vfat") {
+	    if ($type eq "ntfs") {
+		push(@::FatDrives, [$device, $mntpoint, 'win95']);
+	    }
+	    elsif ($type eq "msdos" || $type eq "vfat") {
 		push(@::FatDrives, [$device, $mntpoint, $type]);
 	    }
 	    elsif ($type eq "iso9660" ||
-		   $mntpoint eq "/cdrom" ||
+		   ($mntpoint eq "/cdrom" && ! $type eq 'supermount') ||
 		   ($device eq '/dev/cdrom' && $type eq 'auto') ) {
 		push(@::CdromDrives, [$device, $mntpoint, 'win95']);
+	    }
+	    elsif ( ($mntpoint eq '/mnt/cdrom' || $mntpoint eq '/cdrom') 
+		  && $type eq 'supermount') {
+		push(@::CdromDrives, [ '/dev/cdrom', $mntpoint, 'win95']);
 	    }
 	}
     }