diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2015-06-01 14:02:58 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-06-11 13:12:11 -0700 |
| commit | 04791e4d53650eb108890e9ad9a809768a06987b (patch) | |
| tree | a7ce3371ea797612a2f509c63d901f20a643aef4 /extras/ganesha/ocf/ganesha_nfsd | |
| parent | 9eef639e19c01712aaadfffda22aef795bf1dfeb (diff) | |
common-ha: handle long node names and node names with '-' and '.' in them
sourcing the /etc/ganesha/ganesha-ha.conf file seemed like a simple
and elegant solution for reading config params, but bash variable names
do not allow '-' and '.' in them.
Also fix incorrect path in shared volume mount
Change-Id: I40140e5da0903221efd316de94dce40229263e15
BUG: 1225572
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/11035
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras/ganesha/ocf/ganesha_nfsd')
| -rw-r--r-- | extras/ganesha/ocf/ganesha_nfsd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/ganesha/ocf/ganesha_nfsd b/extras/ganesha/ocf/ganesha_nfsd index d69b9f4ad47..e064183daef 100644 --- a/extras/ganesha/ocf/ganesha_nfsd +++ b/extras/ganesha/ocf/ganesha_nfsd @@ -105,9 +105,9 @@ ganesha_nfsd_stop() if [ -d /var/lib/nfs ]; then mv /var/lib/nfs /var/lib/nfs.backup - ln -s $OCF_RESKEY_ha_vol_mnt/${long_host}/nfs /var/lib/nfs + ln -s $OCF_RESKEY_ha_vol_mnt/nfs-ganesha/${long_host}/nfs /var/lib/nfs if [ $? -ne 0 ]; then - logger "warning: ln -s $OCF_RESKEY_ha_vol_mnt/${long_host}/nfs /var/lib/nfs failed" + logger "warning: ln -s $OCF_RESKEY_ha_vol_mnt/nfs-ganesha/${long_host}/nfs /var/lib/nfs failed" fi fi |