diff options
Diffstat (limited to 'extras/ganesha/scripts/dbus-send.sh')
| -rwxr-xr-x | extras/ganesha/scripts/dbus-send.sh | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/extras/ganesha/scripts/dbus-send.sh b/extras/ganesha/scripts/dbus-send.sh index 5f268eb37c2..45644fd6f71 100755 --- a/extras/ganesha/scripts/dbus-send.sh +++ b/extras/ganesha/scripts/dbus-send.sh @@ -1,11 +1,25 @@ #/bin/bash +# Try loading the config from any of the distro +# specific configuration locations +if [ -f /etc/sysconfig/ganesha ] + then + . /etc/sysconfig/ganesha +fi +if [ -f /etc/conf.d/ganesha ] + then + . /etc/conf.d/ganesha +fi +if [ -f /etc/default/ganesha ] + then + . /etc/default/ganesha +fi + declare -i EXPORT_ID GANESHA_DIR=${1%/} OPTION=$2 VOL=$3 CONF= -CONFFILE= function find_rhel7_conf { @@ -24,14 +38,9 @@ function find_rhel7_conf done } -cfgline=$(grep ^CONFFILE= /etc/sysconfig/ganesha) -eval $(echo ${cfgline} | grep -F ^CONFFILE=) - if [ -z $CONFFILE ] then - cfgline=$(grep ^OPTIONS= /etc/sysconfig/ganesha) - eval $(echo ${cfgline} | grep -F ^OPTIONS=) - find_rhel7_conf $cfgline + find_rhel7_conf $OPTIONS fi |