[readonly/geninitrd: 481/1068] - $CMDLINE available globally per /linuxrc

draenog draenog at pld-linux.org
Sat Nov 2 19:52:49 CET 2013


commit 3a3d4b8a85aab503f94fe6dcad8ce3ba0b2849d4
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Oct 28 18:10:31 2007 +0000

    - $CMDLINE available globally per /linuxrc
    
    svn-id: @8894

 geninitrd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 7e8ef9f..0b3c2be 100755
--- a/geninitrd
+++ b/geninitrd
@@ -1241,7 +1241,8 @@ fi
 cat > "$s" <<'EOF'
 #! /bin/sh
 mount -t proc none /proc
-if [ "$(awk ' /debuginitrd/  { print "yes"; } ' /proc/cmdline)" = "yes" ]; then
+CMDLINE="$(cat /proc/cmdline)"
+if [[ "$CMDLINE" = *debuginitrd* ]]; then
 	set -x
 fi
 umount /proc
@@ -1702,7 +1703,6 @@ if [ "$INITRDFS" = "initramfs" ]; then
 	cat << 'EOF' >> "$s"
 mount -t proc none /proc
 
-CMDLINE="$(busybox cat /proc/cmdline)"
 eval "$(busybox awk -v c="$CMDLINE" '
 BEGIN {
 	num_pattern_short = "[0-9a-f][0-9a-f][0-9a-f]";
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/147754ca159d40ca5eb541074dc043d8cbd92090



More information about the pld-cvs-commit mailing list