diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-07-31 09:48:09 -0400 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-08-01 17:41:25 +0000 |
| commit | 1ae3747608797445c4a59569f93edc331e3626b0 (patch) | |
| tree | be16f4c17bfa361ba93f0398e01d0b26419d9976 /extras | |
| parent | ab4ffdac9dec1867f2d9b33242179cf2b347319d (diff) | |
| download | glusterfs-1ae3747608797445c4a59569f93edc331e3626b0.tar.gz glusterfs-1ae3747608797445c4a59569f93edc331e3626b0.tar.xz glusterfs-1ae3747608797445c4a59569f93edc331e3626b0.zip | |
scripts: invalid test(1) in extras/S32gluster_enable_shared_storage.sh
test(1) man pages says -eq is for INTEGER compares, and = is for
string compares.
Also note the comment that -a and -o are ambiguous and to use
test && test or test || test instead.
This bug has existed since 2015! (yikes)
Found while testing localtime logging and running glusterd in the
foreground.
Change-Id: Ia544f7295e247b981504d085ebc4c533ab60ba84
BUG: 1476785
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/17925
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'extras')
| -rwxr-xr-x | extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh b/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh index ad51babd5f..c0aa73548f 100755 --- a/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh +++ b/extras/hook-scripts/set/post/S32gluster_enable_shared_storage.sh @@ -2,7 +2,7 @@ key=`echo $3 | cut -d '=' -f 1` val=`echo $3 | cut -d '=' -f 2` -if [ ! "$key" -eq "enable-shared-storage" -o "$key" -eq "cluster.enable-shared-storage" ]; then +if [ "$key" != "cluster.enable-shared-storage" ] && [ "$key" != "enable-shared-storage" ]; then exit; fi if [ "$val" != 'enable' ]; then |