[Fai-commit] r6659 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2011-09-10 21:39:39 +0000 (Sat, 10 Sep 2011)
New Revision: 6659

Modified:
   branches/experimental/patches/fix-eval_cmdline
Log:
Updated patch to match current trunk


Modified: branches/experimental/patches/fix-eval_cmdline
===================================================================
--- branches/experimental/patches/fix-eval_cmdline	2011-09-10 21:37:19 UTC (rev 6658)
+++ branches/experimental/patches/fix-eval_cmdline	2011-09-10 21:39:39 UTC (rev 6659)
@@ -7,23 +7,21 @@
 ===================================================================
 --- trunk.orig/lib/subroutines
 +++ trunk/lib/subroutines
-@@ -704,12 +704,16 @@
+@@ -704,10 +704,14 @@
  
      echo -n "Kernel currently running: "
      uname -rsmo
 -    echo -n "Kernel parameters: "; cat /proc/cmdline
+-    for word in $(cat /proc/cmdline) ; do
 +    eval "cmdline=($(</proc/cmdline))"
 +    echo "Kernel parameters: ${cmdline[*]}"
-     shopt -s extglob
--    for word in $(cat /proc/cmdline) ; do
 +    for word in "${cmdline[@]}"; do
- 	case $word in
- 	    *([a-zA-Z0-9_])=*)
+       if echo "$word" | egrep -q '^[a-zA-Z0-9_]*=' ; then
 -		eval "export $word"
 +		varname=${word%%=*}
 +		word=${word#*=}
 +		eval $varname=\$word
 +		eval export $varname
- 		;;
- 	esac
+       fi
      done
+