mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

/etc/init.d/scst: Improved /etc/scst.conf parsing robustness for manually edited scst.conf files

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3569 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2011-06-11 15:55:49 +00:00
parent aa199d8ef6
commit 562809a2da
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scstadmin/init.d/scst
View File

@@ -81,10 +81,10 @@ parse_scst_conf() {
if [ ! -e $SCST_CFG ]; then
return 1
fi
local nonblanks="[^ ]\{1,\}"
local blanks="[ ]\{1,\}"
SCST_MODULES="scst `
sed -n -e 's/^HANDLER'"$blanks"'\(.*\)'"$blanks"'{$/\1/p' -e 's/^\[HANDLER'"$blanks"'\(.*\)\]$/\1/p' \
$SCST_CFG \
SCST_MODULES="scst `sed -n -e 's/^HANDLER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{$/\1/p' \
-e 's/^\[HANDLER'"$blanks"'\('"$nonblanks"'\)\]$/\1/p' $SCST_CFG \
| while read h; do
case "$h" in
dev_cdrom) echo scst_cdrom;;
@@ -98,15 +98,15 @@ parse_scst_conf() {
vdisk*|vcdrom) echo scst_vdisk;;
*) echo "$h";;
esac
done | sort -u;
sed -n 's/^TARGET_DRIVER'"$blanks"'\(.*\)'"$blanks"'{$/\1/p' $SCST_CFG | while read d; do
done | sort -u` \
`sed -n 's/^TARGET_DRIVER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{$/\1/p' $SCST_CFG | while read d; do
case "$d" in
iscsi) echo iscsi_scst;;
qla2x00t) echo qla2x00tgt;;
*) echo "$d";;
esac
done | sort -u
` $SCST_TARGET_MODULES"
done | sort -u` \
$SCST_TARGET_MODULES"
if using_iscsi; then
case "`uname -m`" in
x86_64|i686)