livecd: functions-live, linuxrc, rc.live, installer/installer.sh, ...

[havner]

Author: havner                       Date: Fri Jan 27 01:03:34 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
livecd:
   functions-live (1.10 -> 1.11) , linuxrc (1.16 -> 1.17) , rc.live (1.22 -> 1.23) 
livecd/installer:
   installer.sh (1.115 -> 1.116) 
livecd/remaster:
   livecd_gen_iso (1.12 -> 1.13) , livecd_remaster_prep (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: livecd/functions-live
diff -u livecd/functions-live:1.10 livecd/functions-live:1.11
--- livecd/functions-live:1.10	Thu Jan 26 21:52:43 2006
+++ livecd/functions-live	Fri Jan 27 02:03:29 2006
@@ -72,6 +72,8 @@
 
 getparam()
 {
+	CMDLINE=" `cat /proc/cmdline` "
+
 	case "$CMDLINE" in
 		*\ $1=*)
 			;;

================================================================
Index: livecd/linuxrc
diff -u livecd/linuxrc:1.16 livecd/linuxrc:1.17
--- livecd/linuxrc:1.16	Thu Jan 26 20:43:49 2006
+++ livecd/linuxrc	Fri Jan 27 02:03:29 2006
@@ -8,6 +8,8 @@
 
 getparam()
 {
+	CMDLINE=" `cat /proc/cmdline` "
+
 	case "$CMDLINE" in
 		*\ $1=*)
 			;;
@@ -55,8 +57,6 @@
 mkdir -p /rootfs/media/LiveCD
 mount -n -t proc none /proc
 
-CMDLINE=" `cat /proc/cmdline` "
-
 if getparam debug > /dev/null; then
 	LOG=/dev/console
 	dmesg -n 7
@@ -221,7 +221,8 @@
 mount -o bind live/usr-bind usr > $LOG 2>&1
 umount -n /proc > $LOG 2>&1
 
+mkdir initrd
 pivot_root . initrd
 
 #/bin/echo "${BLUE}Starting init${NORMAL}"
-exec /usr/sbin/chroot . /sbin/init ${INITPARAM}
+exec /usr/sbin/chroot . /sbin/init ${INITPARAM} <dev/console >dev/console 2>&1

================================================================
Index: livecd/rc.live
diff -u livecd/rc.live:1.22 livecd/rc.live:1.23
--- livecd/rc.live:1.22	Fri Jan 27 00:48:39 2006
+++ livecd/rc.live	Fri Jan 27 02:03:29 2006
@@ -14,8 +14,6 @@
 
 touch /fastboot
 
-CMDLINE=" `cat /proc/cmdline` "
-
 if getparam debug > /dev/null; then
 	LOG=/dev/console
 	dmesg -n 7

================================================================
Index: livecd/installer/installer.sh
diff -u livecd/installer/installer.sh:1.115 livecd/installer/installer.sh:1.116
--- livecd/installer/installer.sh:1.115	Thu Jan 26 21:26:42 2006
+++ livecd/installer/installer.sh	Fri Jan 27 02:03:29 2006
@@ -133,7 +133,6 @@
 		normal_to_grub
 		normal_to_dev
 		grootpart=$gpart
-		CMDLINE="`cat /proc/cmdline`"
 		PARAMS="root=$devpart"
 		if getparam vga > /dev/null 2>&1; then
 			PARAMS="$PARAMS vga=`getparam vga`"

================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.12 livecd/remaster/livecd_gen_iso:1.13
--- livecd/remaster/livecd_gen_iso:1.12	Thu Jan 26 21:49:19 2006
+++ livecd/remaster/livecd_gen_iso	Fri Jan 27 02:03:29 2006
@@ -36,6 +36,7 @@
 
 # preparation, external scripts
 
+echo "Running livecd_gen_initrd to prepare/fix livecd internal initrd."
 if [ ! -f "`which livecd_gen_initrd`" ]; then
 	echo "There is no livecd_gen_initrd script."
 	exit 1

================================================================
Index: livecd/remaster/livecd_remaster_prep
diff -u livecd/remaster/livecd_remaster_prep:1.12 livecd/remaster/livecd_remaster_prep:1.13
--- livecd/remaster/livecd_remaster_prep:1.12	Thu Jan 26 21:08:24 2006
+++ livecd/remaster/livecd_remaster_prep	Fri Jan 27 02:03:29 2006
@@ -34,15 +34,15 @@
 	exit 1
 fi
 
-mkdir $MAINDIR
-
 mount $MNT_CDROM
 
 if [ ! -f $MNT_CDROM/pldcd ]; then
 	echo "You must insert PLD Live CD"
+	umount $MNT_CDROM > /dev/null 2>&1
 	exit 1
 fi
 
+mkdir $MAINDIR
 mkdir $MNT_INITRD
 mkdir $MNT_SQUASHFS
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/functions-live?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/livecd/linuxrc?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/livecd/rc.live?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/livecd/installer/installer.sh?r1=1.115&r2=1.116&f=u
    http://cvs.pld-linux.org/livecd/remaster/livecd_gen_iso?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/livecd/remaster/livecd_remaster_prep?r1=1.12&r2=1.13&f=u