From: Frank Terbeck <ft@bewatermyfriend.org>
Date: Wed, 9 Sep 2009 19:05:09 +0000 (+0200)
Subject: Fix a bug in checkbootparam()
X-Git-Tag: v0.8.28~4
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=062bbe2ba5ec77c0a5c994efd43d91cf2d64d1f8

Fix a bug in checkbootparam()

This now passes Ulrich's testsuite.
---

diff --git a/autoconfig.functions b/autoconfig.functions
index b0a6d9b..8e7df56 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -65,13 +65,16 @@ getbootparam(){
 # Check boot commandline for specified option
 checkbootparam(){
   [ -n "$1" ] || ( echo "Error: missing argument to checkbootparam()" ; return 1 )
-  # make sure we match beginning and end of line as well
-  # but don't match 'vg' if we want to check for 'vga'
-  if echo "$CMDLINE" | grep -qw "$1" ; then
-     return 0
-  else
-     return 1
-  fi
+  local line
+  local ws
+  ws='	 '
+  line=" $CMDLINE "
+  case "$line" in
+    *[${ws}]"$1"=*|*[${ws}]"$1"[${ws}]*)
+      return 0 ;;
+    *)
+      return 1 ;;
+  esac
 }
 
 # Check wheter a configuration variable (like $CONFIG_TOHD) is