[Devil-linux-commit] build/config/etc/initrd mount_cdrom,1.30,1.31

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

Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8302

Modified Files:
	mount_cdrom 
Log Message:
we need this....


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- mount_cdrom	22 Apr 2005 19:19:54 -0000	1.30
+++ mount_cdrom	26 Apr 2005 03:26:41 -0000	1.31
@@ -22,9 +22,15 @@
 fi
 
 # generate list of cdroms from devfs
-DEVICES_IDE=`find /dev -name "hd*" 2> /dev/null`
-CDROM_SCSI=`find /dev -name "sr*" 2> /dev/null`
-CDROMS="$DEVICES_IDE $CDROM_SCSI"
+CDROM_IDE=`find /dev/ide/ -name "cd*" 2> /dev/null`
+CDROM_SCSI=`find /dev/scsi/ -name "cd*" 2> /dev/null`
+CDROMS="$CDROM_IDE $CDROM_SCSI"
+
+if [ "$3" != "silent" ]; then
+	$GREEN
+	echo "Search list: $CDROMS"
+	$NORMAL
+fi
 
 for disk in $CDROMS
 do
@@ -52,10 +58,10 @@
 done
 
 # ok let's check all partitions if we find the bootcd.iso & the file DEVIL-LINUX
-DEVICES_IDE=`find /dev -name "hd*" 2> /dev/null`
-DISCS_SCSI=`find /dev -name "sd*" 2> /dev/null`
-DISCS="$DEVICES_IDE $DISCS_SCSI"
-for disk in $DISCS
+PARTITIONS_IDE=`find /dev/ide/ -name "part*" 2> /dev/null`
+PARTITIONS_SCSI=`find /dev/scsi/ -name "part*" 2> /dev/null`
+PARTITIONS="$PARTITIONS_IDE $PARTITIONS_SCSI"
+for disk in $PARTITIONS
 do
 	echo -n "checking $disk "
 	if mount -n -t auto -o rw,noatime $disk /mnt 2> /dev/null; then
@@ -80,25 +86,25 @@
 				if mv /mnt/bootcd.iso.new /mnt/bootcd.iso ; then
 				    # create flag file, so the other scripts know about it
 				    touch /shm/dl_iso_replaced
-			            $BLUE
-    				    echo "Upgrading System Boot Files"
-			            $NORMAL
-			            
-				    mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso /cdrom
-				    
-				    cp -fp /cdrom/boot/* /mnt/boot/ 2> /dev/null
-			            cp -fp /cdrom/DEVIL-LINUX /mnt/
-			            sync
-			            umount /cdrom &> /dev/null
-			            umount /mnt &> /dev/null
+                                    $BLUE
+                                    echo "Upgrading System Boot Files"
+                                    $NORMAL
+
+                                    mount -o loop -t iso9660 /mnt/bootcd.iso /cdrom
+
+                                    cp -fp /cdrom/boot/* /mnt/boot/ 2> /dev/null
+                                    cp -fp /cdrom/DEVIL-LINUX /mnt/
+                                    sync
+				    umount /cdrom &> /dev/null
+                                    
                                     $GREEN
                                     echo "Mounting old version"
                                     $NORMAL
-                                    mount -o loop -t iso9660 /mnt/bootcd.iso.old $1 || return 1
-                                    echo $disk > /shm/DL_DEVICE
-                                    dl_version=`cat /mnt/DEVIL-LINUX` 2> /dev/null
+				    mount -o loop -t iso9660 /mnt/bootcd.iso.old $1 || return 1
+				    echo $disk > /shm/DL_DEVICE
+				    dl_version=`cat /mnt/DEVIL-LINUX 2> /dev/null`
                                     exit 0
- 				else
+				else
 					echo "Activation failed"
 				fi
 				# make sure the changes are written immediately
@@ -112,7 +118,7 @@
 				# because bootcd.iso is still mounted inside it.
 				# RO will make it less painfull.
 				mount -o remount,ro,noatime $disk 2> /dev/null
-				mount -o loop=/dev/loop0 -t iso9660 /mnt/bootcd.iso $1 || return 1
+				mount -o loop -t iso9660 /mnt/bootcd.iso $1 || return 1
 				echo $disk > /shm/DL_DEVICE
 				dl_version=`cat /mnt/DEVIL-LINUX 2> /dev/null`
 				if [ "$3" != "silent" ]; then