r1225 - in trunk: doc scripts

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Dec 5 06:15:11 PST 2005


Author: alexander
Date: 2005-12-05 07:15:10 -0700 (Mon, 05 Dec 2005)
New Revision: 1225

Modified:
   trunk/doc/README
   trunk/scripts/shutdown-helper
Log:
Updated version in documentation
Fixed error reporting in shutdown helper


Modified: trunk/doc/README
===================================================================
--- trunk/doc/README	2005-12-05 14:06:22 UTC (rev 1224)
+++ trunk/doc/README	2005-12-05 14:15:10 UTC (rev 1225)
@@ -96,7 +96,7 @@
 instructions below.
 
 * Burn the official CD in multi session mode:
-    cdrecord dev=/dev/cdrom -v -multi -tao lfslivecd-x86-1-[version].iso
+    cdrecord dev=/dev/cdrom -v -multi -tao lfslivecd-[version].iso
 
 * Prepare a directory with the files you want to add, delete or change:
     mkdir second-session && cd second-session
@@ -106,7 +106,7 @@
     cd ..
 
 * Make an image contatining those files:
-    mkisofs -M lfslivecd-x86-6.1-1-[version].iso \
+    mkisofs -M lfslivecd-[version].iso \
         -C `cdrecord -msinfo dev=/dev/cdrom` \
 	-R -o second-session.iso second-session
 

Modified: trunk/scripts/shutdown-helper
===================================================================
--- trunk/scripts/shutdown-helper	2005-12-05 14:06:22 UTC (rev 1224)
+++ trunk/scripts/shutdown-helper	2005-12-05 14:15:10 UTC (rev 1225)
@@ -38,29 +38,32 @@
 cat >/dev/shm/sbin/init <<EOF
 #!/bin/sh
 
+halt() {
+	$HALT
+	while true ; do sleep 1 ; done
+}
+
 fail() {
 	echo "Could not unmount the CD, sorry. Please report this as a bug."
 	sleep 5
-	$HALT
-	while true ; do sleep 1 ; done
+	halt
 }
 
 exec </dev/console >/dev/console 2>/dev/console
 TIMEOUT=
-while ! umount -n /old 2>/dev/null && [ "$TIMEOUT" != "....." ] ; do
+while ! umount -n /old 2>/dev/null && [ "\$TIMEOUT" != "....." ] ; do
         sleep 1
-	TIMEOUT=".$TIMEOUT"
+	TIMEOUT=".\$TIMEOUT"
 done
-[ "$TIMEOUT" = "....." ] && fail
+[ "\$TIMEOUT" = "....." ] && fail
 umount -n /.sqfs || fail
 losetup -d /dev/loop0 || fail
 umount -n /.cdrom || fail
-( sleep 30 ; $HALT ) &
 eject -r /dev/lfs-cd
 echo -n "Take the CD, close the CD-ROM tray and press Enter..."
+( sleep 30 ; halt ) &
 read ENTER
-$HALT
-while true ; do sleep 1 ; done
+halt
 EOF
 chmod 755 /dev/shm/sbin/init
 ln -nsf /old/dev/initctl /dev/shm/dev/initctl




More information about the livecd mailing list