[Devil-linux-commit] build/config/etc/initrd mount_cdrom,1.25.2.10,1.25.2.11

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

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

Modified Files:
      Tag: rel-1-2-patches
	mount_cdrom 
Log Message:
- fixed boot command line parameter DL_device (Frank Weis / Heiko)


Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.25.2.10
retrieving revision 1.25.2.11
diff -u -d -r1.25.2.10 -r1.25.2.11
--- mount_cdrom	18 Feb 2006 21:19:19 -0000	1.25.2.10
+++ mount_cdrom	19 Feb 2006 17:00:42 -0000	1.25.2.11
@@ -26,6 +26,17 @@
 CDROM_SCSI=`find /dev/scsi/ -name "cd*" 2> /dev/null`
 CDROMS="$CDROM_IDE $CDROM_SCSI"
 
+DEVICE_USER=`awk -v RS=' ' -v FS='=' '/^DL_device=/ { print $2 }' /proc/cmdline`
+DEVICE_USER_ONLY=`grep -c DL_device /proc/cmdline`
+
+if [ "$DEVICE_USER_ONLY" != "0" ]; then
+        $RED
+        echo "Disabling automatic scanning for Devil-Linux iso image! Good Luck."
+        $NORMAL
+	CDROMS=$DEVICE_USER
+fi
+
+
 if [ "$3" != "silent" ]; then
 	$GREEN
 	echo "Search list: $CDROMS"
@@ -61,6 +72,13 @@
 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"
+if [ "$DEVICE_USER_ONLY" != "0" ]; then
+        $RED
+        echo "Disabling automatic scanning for Devil-Linux iso image! Good Luck."
+        $NORMAL
+	PARTITIONS=$DEVICE_USER
+fi
+
 for disk in $PARTITIONS
 do
 	echo -n "checking $disk "