From 47ac46c0c64ac7d13c3c1e460891ae52352e4eea Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 12 Aug 2012 20:43:02 +0200 Subject: [PATCH] Fix parsing of --config=... command line option Before, --config=... could not be combined with anything else on the command line --- ChangeLog | 3 +++ genkernel | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79a318b..bee9ecb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ + 12 Aug 2012; Sebastian Pipping genkernel: + Fix parsing of --config=... command line option + 27 Jul 2012; Sebastian Pipping defaults/initrd.scripts, genkernel: Bump version to 3.4.40 diff --git a/genkernel b/genkernel index 5ee2d42..98f24d9 100755 --- a/genkernel +++ b/genkernel @@ -25,11 +25,12 @@ parse_opt() { # We don't know where our config is, so we check for it, and default to using # /etc/genkernel.conf if nobody has specified one. -case "$*" in - --config=*) - CMD_GK_CONFIG=`parse_opt "$*"` - ;; -esac + +# NOTE: We are look for --config=... in a way that doesn't modify $@ since we access that again, later +for (( i=1; i<=$# ; i=i+1 )); do + eval arg="\$$i" + [[ "${arg}" = --config=* ]] && CMD_GK_CONFIG=`parse_opt "${arg}"` +done # Pull in our configuration _GENKERNEL_CONF=${CMD_GK_CONFIG:-/etc/genkernel.conf} -- 2.26.2