r1911 - trunk/packages/initramfs

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Jun 10 05:10:55 PDT 2007


Author: alexander
Date: 2007-06-10 06:10:55 -0600 (Sun, 10 Jun 2007)
New Revision: 1911

Modified:
   trunk/packages/initramfs/init.in
Log:
Fixed a typo and a thinko

Modified: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in	2007-06-10 11:31:25 UTC (rev 1910)
+++ trunk/packages/initramfs/init.in	2007-06-10 12:10:55 UTC (rev 1911)
@@ -18,7 +18,7 @@
 find_cd() {
 	for SYS in /sys/block/hd* /sys/block/sr* ; do
 		[ ! -d "$SYS" ] && continue
-		[ -f "$SYS/media" ] && read MEDIA <"$SYS/media" [ "$MEDIA" != "cdrom" ] && continue
+		[ -f "$SYS/media" ] && read MEDIA <"$SYS/media" && [ "$MEDIA" != "cdrom" ] && continue
 		DEV=/dev/${SYS##*/}
 		LABEL=`dd if=$DEV bs=1 skip=32808 count=32 2>/dev/null`
 		[ "$LABEL" = "$EXPECTED_LABEL" ] && ln -s "$DEV" /dev/lfs-cd && break
@@ -230,7 +230,7 @@
 /sbin/udevsettle
 if [ -n "$rootdelay" ] ; then sleep "$rootdelay" ; fi
 
-do_resume
+[ "$noresume" = 0 ] && do_resume
 do_mount_root
 
 killall -w /sbin/udevd




More information about the livecd mailing list