[Devil-linux-commit] build/config/etc/initrd mount_cdrom,1.17,1.18

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1:/tmp/cvs-serv20702/config/etc/initrd

Modified Files:
	mount_cdrom 
Log Message:
- install-usb now uses fat file system and the plain bootcd.iso file
- ISO can now be in ZISOFS format (optional)
- compile our own static syslinux-nomtools


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mount_cdrom	7 Sep 2003 13:58:47 -0000	1.17
+++ mount_cdrom	8 Nov 2003 04:04:51 -0000	1.18
@@ -69,8 +69,12 @@
 
 # USB devices
 for disk in sda1 sdb1 sdc1 sdd1 sde1 sdf1 sdg1 sdh1; do
-	if mount -n -t ext2 -o rw,noatime /dev/$disk $1 2> /dev/null; then
-		if [ -e $1/DEVIL-LINUX ] ; then
+	if mount -n -t auto -o rw,noatime /dev/$disk /mnt 2> /dev/null; then
+		if [ -e /mnt/DEVIL-LINUX ] ; then
+			if [ -e /mnt/bootcd.iso ] ; then
+				mount -o loop -t iso9660 /mnt/bootcd.iso $1 || return 1
+				exit 0
+			fi
 			if [ "$3" != "silent" ]; then
 				$YELLOW
 				echo -e "\nFound on /dev/$disk"
@@ -78,7 +82,7 @@
 			fi
 			exit 0
 		else
-			umount $1
+			umount /mnt
 		fi
 	fi
 done