From d5fb1ed14712e0b5fc336101fa71800c176285e3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 6 Jan 2013 09:34:53 +0000 Subject: [PATCH] /etc/init.d/scst: When parsing /etc/scst.conf for "TARGET_DRIVER ... {", accept blanks at the end of the line (merge r4259 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4687 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/init.d/scst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scstadmin/init.d/scst b/scstadmin/init.d/scst index fae10d869..bd0ed7083 100755 --- a/scstadmin/init.d/scst +++ b/scstadmin/init.d/scst @@ -128,7 +128,8 @@ parse_scst_conf() { fi local nonblanks="[^ ]\{1,\}" local blanks="[ ]\{1,\}" - SCST_MODULES="$SCST_MODULES `sed -n -e 's/^HANDLER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{$/\1/p' \ + local optblanks="[ ]*" + SCST_MODULES="$SCST_MODULES `sed -n -e 's/^HANDLER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{'"$optblanks"'$/\1/p' \ -e 's/^\[HANDLER'"$blanks"'\('"$nonblanks"'\)\]$/\1/p' $SCST_CFG \ | while read h; do case "$h" in @@ -144,7 +145,7 @@ parse_scst_conf() { *) echo "$h";; esac done | sort -u` \ - `sed -n 's/^TARGET_DRIVER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{$/\1/p' $SCST_CFG | while read d; do + `sed -n 's/^TARGET_DRIVER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{'"$optblanks"'$/\1/p' $SCST_CFG | while read d; do case "$d" in iscsi) echo iscsi_scst;; qla2x00t) echo qla2x00tgt;;