ppcrcd/trunk/initrd.dir/linuxrc
sparky
cvs at pld-linux.org
Thu Mar 23 22:22:06 CET 2006
Author: sparky
Date: Thu Mar 23 22:21:57 2006
New Revision: 7300
Modified:
ppcrcd/trunk/initrd.dir/linuxrc
Log:
- debugi option
- match \<stop\>
Modified: ppcrcd/trunk/initrd.dir/linuxrc
==============================================================================
--- ppcrcd/trunk/initrd.dir/linuxrc (original)
+++ ppcrcd/trunk/initrd.dir/linuxrc Thu Mar 23 22:21:57 2006
@@ -6,8 +6,8 @@
B="$P/bin"
$B/mount -n -t proc proc /proc
-#@initrd@ debug: put debugging information (set -x)
-if $B/awk '/debug/ { exit 0 }; { exit 1 }' /proc/cmdline; then
+#@initrd@ debugi / debug: put debugging information (set -x)
+if $B/awk '/(^| |\t)debugi?( |\t|$)/ { exit 0 }; { exit 1 }' /proc/cmdline; then
set -x
else
$B/echo 0 > /proc/sys/kernel/printk
@@ -120,6 +120,7 @@
done
if $B/test -z "$FOUND"; then
+ $B/echo "${cR}Trying HFS+, shit may happen${cE}"
modload hfsplus
checkcd hfsplus
fi
@@ -175,7 +176,7 @@
# prepare loop and mount
#@bootoption@ tomempost:
#@ load image to ram
-if $B/awk "/tomempost/ { exit 0 }; { exit 1 }" /proc/cmdline; then
+if $B/awk '/tomempost/ { exit 0 }; { exit 1 }' /proc/cmdline; then
$B/echo "${cG}*** Copying ppcrcd.sqf image${cE}"
$B/cat /media/ppcrcd/ppcrcd.sqf > /ppcrcd.sqf
$B/losetup $P/dev/loop7 /ppcrcd.sqf || error "Can't setup loop device"
@@ -233,7 +234,7 @@
/bin/mount -f /
#@initrd@ stop: runs shell at end of initrd script
-$B/awk "/stop/ { exit 0 }; { exit 1 }" /proc/cmdline && error "stop requested"
+$B/awk '/(^| |\t)stop( |\t|$)/ { exit 0 }; { exit 1 }' /proc/cmdline && error "stop requested"
$B/umount /proc
#/bin/umount /initrd
#/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
More information about the pld-cvs-commit
mailing list