livecd: linuxrc - be more verbosive in some cases - check initrd d...
havner
havner at pld-linux.org
Wed Jul 12 09:37:17 CEST 2006
Author: havner Date: Wed Jul 12 07:37:17 2006 GMT
Module: livecd Tag: HEAD
---- Log message:
- be more verbosive in some cases
- check initrd dir, not mkdir...
---- Files affected:
livecd:
linuxrc (1.23 -> 1.24)
---- Diffs:
================================================================
Index: livecd/linuxrc
diff -u livecd/linuxrc:1.23 livecd/linuxrc:1.24
--- livecd/linuxrc:1.23 Tue Jul 11 15:12:36 2006
+++ livecd/linuxrc Wed Jul 12 09:37:12 2006
@@ -61,6 +61,7 @@
if getparam debug > /dev/null; then
LOG=/dev/console
echo 7 > /proc/sys/kernel/printk
+ set -x
else
LOG=/dev/null
echo 5 > /proc/sys/kernel/printk
@@ -144,7 +145,6 @@
mount -n -o ro -t $HDD_fs /dev/$HDD_dev /rootfs/mnt/hd
mount -n -o ro,loop -t iso9660 /rootfs/mnt/hd/pldcd.iso /rootfs/media/LiveCD
else
- echo 0 > /proc/sys/kernel/printk
LOG=/dev/null
echo "${MAGENTA}Searching for PLD Live CDROM${NORMAL}"
DEVICES="$DEVICES /dev/hd[cd] /dev/hd[ab] /dev/scd[0-9] /dev/hd[e-l]"
@@ -170,13 +170,6 @@
echo "Restart your computer now and send bugreport.${NORMAL}"
read NOTHING
fi
- if getparam debug > /dev/null; then
- echo 7 > /proc/sys/kernel/printk
- LOG=/dev/console
- else
- echo 5 > /proc/sys/kernel/printk
- LOG=/dev/null
- fi
fi
if getparam md5 > /dev/null; then
@@ -222,7 +215,7 @@
mount -o bind live/usr-bind usr > $LOG 2>&1
umount -n /proc > $LOG 2>&1
-[ ! -d mkdir ] && mkdir initrd
+[ ! -d initrd ] && mkdir initrd
pivot_root . initrd
exec /usr/sbin/chroot . /sbin/init ${INITPARAM} <dev/console >dev/console 2>&1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/livecd/linuxrc?r1=1.23&r2=1.24&f=u
More information about the pld-cvs-commit
mailing list