166 lines
8.4 KiB
Diff
166 lines
8.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 9 Jul 2021 14:30:10 -0500
|
|
Subject: [PATCH] RH: mpathconf: correctly handle spaces after option names
|
|
|
|
mpathconf was either accepting any number of spaces, including zero,
|
|
after option names, or it was only accepting one space. It should
|
|
accept one or more spaces.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipath/mpathconf | 40 ++++++++++++++++++++--------------------
|
|
1 file changed, 20 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/multipath/mpathconf b/multipath/mpathconf
|
|
index 2f4f3eaf..5f2285ab 100644
|
|
--- a/multipath/mpathconf
|
|
+++ b/multipath/mpathconf
|
|
@@ -240,7 +240,7 @@ function validate_args
|
|
echo "--enable_foreign must be either 'y' or 'n'"
|
|
exit 1
|
|
fi
|
|
- if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" -a -z "$PROPERTY" ]; then
|
|
+ if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" -a -z "$PROPERTY" -a -z "$FOREIGN" ]; then
|
|
SHOW_STATUS=1
|
|
fi
|
|
if [ -n "$MODULE" ] && [ "$MODULE" != "y" -a "$MODULE" != "n" ]; then
|
|
@@ -315,36 +315,36 @@ if [ "$MULTIPATHD" = "y" ]; then
|
|
fi
|
|
|
|
if [ "$HAVE_BLACKLIST" = "1" ]; then
|
|
- if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*devnode \"\.\?\*\"" ; then
|
|
+ if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"" ; then
|
|
HAVE_DISABLE=1
|
|
- elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*devnode \"\.\?\*\"" ; then
|
|
+ elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"" ; then
|
|
HAVE_DISABLE=0
|
|
fi
|
|
fi
|
|
|
|
if [ "$HAVE_BLACKLIST" = "1" ]; then
|
|
- if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*wwid \"\.\?\*\"" ; then
|
|
+ if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*wwid[[:space:]][[:space:]]*\"\.\?\*\"" ; then
|
|
HAVE_WWID_DISABLE=1
|
|
- elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*wwid \"\.\?\*\"" ; then
|
|
+ elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*wwid[[:space:]][[:space:]]*\"\.\?\*\"" ; then
|
|
HAVE_WWID_DISABLE=0
|
|
fi
|
|
fi
|
|
|
|
if [ "$HAVE_DEFAULTS" = "1" ]; then
|
|
- HAVE_FIND=`sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | sed -n 's/^[[:blank:]]*find_multipaths[[:blank:]]*\([^[:blank:]]*\).*$/\1/p' | sed -n 1p`
|
|
+ HAVE_FIND=`sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | sed -n 's/^[[:blank:]]*find_multipaths[[:blank:]][[:blank:]]*\([^[:blank:]]*\).*$/\1/p' | sed -n 1p`
|
|
if [ "$HAVE_FIND" = "1" ]; then
|
|
HAVE_FIND="yes"
|
|
elif [ "$HAVE_FIND" = "0" ]; then
|
|
HAVE_FIND="no"
|
|
fi
|
|
- if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*\(yes\|1\)" ; then
|
|
+ if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(yes\|1\)" ; then
|
|
HAVE_FRIENDLY=1
|
|
- elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*\(no\|0\)" ; then
|
|
+ elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(no\|0\)" ; then
|
|
HAVE_FRIENDLY=0
|
|
fi
|
|
if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*enable_foreign" ; then
|
|
HAVE_FOREIGN=0
|
|
- elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign[[:space:]]*\"\^\$\"" ; then
|
|
+ elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign[[:space:]][[:space:]]*\"\^\$\"" ; then
|
|
HAVE_FOREIGN=1
|
|
elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*enable_foreign" ; then
|
|
HAVE_FOREIGN=2
|
|
@@ -352,9 +352,9 @@ if [ "$HAVE_DEFAULTS" = "1" ]; then
|
|
fi
|
|
|
|
if [ "$HAVE_EXCEPTIONS" = "1" ]; then
|
|
- if sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
|
|
+ if sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
|
|
HAVE_PROPERTY=1
|
|
- elif sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
|
|
+ elif sed -n '/^blacklist_exceptions[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"" ; then
|
|
HAVE_PROPERTY=0
|
|
fi
|
|
fi
|
|
@@ -427,14 +427,14 @@ fi
|
|
|
|
if [ "$ENABLE" = 2 ]; then
|
|
if [ "$HAVE_DISABLE" = 1 ]; then
|
|
- sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode \"\.\?\*\"/# devnode ".*"/' $TMPFILE
|
|
+ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"/# devnode ".*"/' $TMPFILE
|
|
fi
|
|
if [ -z "$HAVE_WWID_DISABLE" ]; then
|
|
sed -i '/^blacklist[[:space:]]*{/ a\
|
|
wwid ".*"
|
|
' $TMPFILE
|
|
elif [ "$HAVE_WWID_DISABLE" = 0 ]; then
|
|
- sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*wwid \"\.\?\*\"/ wwid ".*"/' $TMPFILE
|
|
+ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*wwid[[:space:]][[:space:]]*\"\.\?\*\"/ wwid ".*"/' $TMPFILE
|
|
fi
|
|
if [ "$HAVE_EXCEPTIONS" = 1 ]; then
|
|
sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ {/^[[:space:]]*wwid/ d}' $TMPFILE
|
|
@@ -448,7 +448,7 @@ _EOF_
|
|
add_blacklist_exceptions
|
|
elif [ "$ENABLE" = 1 ]; then
|
|
if [ "$HAVE_DISABLE" = 1 ]; then
|
|
- sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode \"\.\?\*\"/# devnode ".*"/' $TMPFILE
|
|
+ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"/# devnode ".*"/' $TMPFILE
|
|
fi
|
|
elif [ "$ENABLE" = 0 ]; then
|
|
if [ -z "$HAVE_DISABLE" ]; then
|
|
@@ -456,7 +456,7 @@ elif [ "$ENABLE" = 0 ]; then
|
|
devnode ".*"
|
|
' $TMPFILE
|
|
elif [ "$HAVE_DISABLE" = 0 ]; then
|
|
- sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*devnode \"\.\?\*\"/ devnode ".*"/' $TMPFILE
|
|
+ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*devnode[[:space:]][[:space:]]*\"\.\?\*\"/ devnode ".*"/' $TMPFILE
|
|
fi
|
|
fi
|
|
|
|
@@ -467,14 +467,14 @@ if [ -n "$FIND" ]; then
|
|
' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
elif [ "$FIND" != "$HAVE_FIND" ]; then
|
|
- sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:blank:]]*find_multipaths[[:blank:]]*[^[:blank:]]*/ find_multipaths '"$FIND"'/' $TMPFILE
|
|
+ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:blank:]]*find_multipaths[[:blank:]][[:blank:]]*[^[:blank:]]*/ find_multipaths '"$FIND"'/' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
fi
|
|
fi
|
|
|
|
if [ "$FRIENDLY" = "n" ]; then
|
|
if [ "$HAVE_FRIENDLY" = 1 ]; then
|
|
- sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*\(yes\|1\)/ user_friendly_names no/' $TMPFILE
|
|
+ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(yes\|1\)/ user_friendly_names no/' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
fi
|
|
elif [ "$FRIENDLY" = "y" ]; then
|
|
@@ -484,14 +484,14 @@ elif [ "$FRIENDLY" = "y" ]; then
|
|
' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
elif [ "$HAVE_FRIENDLY" = 0 ]; then
|
|
- sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*\(no\|0\)/ user_friendly_names yes/' $TMPFILE
|
|
+ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]][[:space:]]*\(no\|0\)/ user_friendly_names yes/' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
fi
|
|
fi
|
|
|
|
if [ "$PROPERTY" = "n" ]; then
|
|
if [ "$HAVE_PROPERTY" = 1 ]; then
|
|
- sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/# property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
|
|
+ sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/# property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
fi
|
|
elif [ "$PROPERTY" = "y" ]; then
|
|
@@ -501,7 +501,7 @@ elif [ "$PROPERTY" = "y" ]; then
|
|
' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
elif [ "$HAVE_PROPERTY" = 0 ]; then
|
|
- sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*property[[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/ property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
|
|
+ sed -i '/^blacklist_exceptions[[:space:]]*{/,/^}/ s/^[[:space:]]*#[[:space:]]*property[[:space:]][[:space:]]*\"(SCSI_IDENT_|ID_WWN)\"/ property \"(SCSI_IDENT_|ID_WWN)\"/' $TMPFILE
|
|
CHANGED_CONFIG=1
|
|
fi
|
|
fi
|
|
--
|
|
2.30.2
|
|
|