commit 4940c3778751f6bbe7b8de1735518880801b5fa4
author Dustin Navea <speeddymon@yahoo.com> Tue Apr 23 19:34:11 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Apr 23 19:34:11 2002 +0000
tree 8c8c35862d670173cca48f7cc357d8dbab3137f8
parent e052196134fac3f23c66d45b77388563943a9d1a

Find ntfs drives and supermount cd-roms.
Fix finding non-supermount cd-roms mounted at /cdrom.

tools/wineconf

diff --git a/tools/wineconf b/tools/wineconf
index 8a5e0ba..6c211c1 100755
--- a/tools/wineconf
+++ b/tools/wineconf
@@ -93,14 +93,21 @@
 
 	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']);
+	    }
 	}
     }
     if (!@::FatDrives) {