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

[Michael Tautschnig]

Author: mt
Date: 2010-05-25 18:04:32 +0000 (Tue, 25 May 2010)
New Revision: 5783

Added:
   branches/experimental/patches/fix-eval_cmdline
Modified:
   branches/experimental/patches/series
Log:
added Waldemar's/Thorsten's eval_cmdline patch


Added: branches/experimental/patches/fix-eval_cmdline
===================================================================
--- branches/experimental/patches/fix-eval_cmdline	                        (rev 0)
+++ branches/experimental/patches/fix-eval_cmdline	2010-05-25 18:04:32 UTC (rev 5783)
@@ -0,0 +1,40 @@
+2010-05-25  Michael Tautschnig  <mt at debian.org>
+
+	* subroutines: Fix eval_cmdline failures when finetuning NFS options (thanks
+		Thorsten Glaser <tg at debian.org> and Waldemar Brodkorb
+		<fai at waldemar-brodkorb.de>)
+Index: trunk/lib/subroutines
+===================================================================
+--- trunk.orig/lib/subroutines
++++ trunk/lib/subroutines	
+@@ -643,18 +643,22 @@
+     echo -n "Kernel currently running: "
+     uname -rsmo
+     echo -n "Kernel parameters: "; cat /proc/cmdline
+-    for word in $(cat /proc/cmdline) ; do
+-	case $word in
+-	    FAI_CLASSES=*)
+-                eval "$word"
+-		for class in ${FAI_CLASSES//,/ }; do
+-		    echo $class >>/tmp/l
+-		done
++    eval "cmdline=($(</proc/cmdline))"
++    echo "Kernel parameters: ${cmdline[*]}"
++    for word in "${cmdline[@]}"; do
++        case $word in
++            FAI_CLASSES=*)
++		word=${word#*=}
++		eval "classes=(${word//,/ })"
++		printf '%s\n' "${classes[@]}" >>/tmp/l
+ 		unset FAI_CLASSES
+ 		;;
+ 
+ 	    [a-zA-Z]*=*)
+-		eval "export $word"
++		varname=${word%%=*}
++		word=${word#*=}
++		eval $varname=\$word
++		eval export $varname
+ 		;;
+ 	esac
+     done

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-05-11 17:13:40 UTC (rev 5782)
+++ branches/experimental/patches/series	2010-05-25 18:04:32 UTC (rev 5783)
@@ -14,3 +14,4 @@
 setup-storage_empty-vg
 setup-storage_abs-path
 setup-storage_devmapper
+fix-eval_cmdline