diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-08-14 13:06:26 -0700 | 
|---|---|---|
| committer | Harshavardhana <harsha@harshavardhana.net> | 2014-09-03 11:01:45 -0700 | 
| commit | 025ae07850375cbf981ed335a4ddf702d54be6e3 (patch) | |
| tree | a119246764dc98f0d0c7fb87572cd1b01bc18684 /extras/hook-scripts/set/post/S30samba-set.sh | |
| parent | 845d6c76701a3de6a11b76b004176971411c714e (diff) | |
build: make GLUSTERD_WORKDIR rely on localstatedir
Backport from master branch - http://review.gluster.org/#/c/8246/
- Break-way from '/var/lib/glusterd' hard-coded previously,
  instead rely on 'configure' value from 'localstatedir'
- Provide 's/lib/db' as default working directory for gluster
  management daemon for BSD and Darwin based installations
- loff_t is really off_t on Darwin
- fix-off the warnings generated by clang on FreeBSD/Darwin
- Now 'tests/*' use GLUSTERD_WORKDIR a common variable for all
  platforms.
- Define proper environment for running tests, define correct PATH
  and LD_LIBRARY_PATH when running tests, so that the desired version
  of glusterfs is used, regardless where it is installed.
  (Thanks to manu@netbsd.org for this additional work)
Change-Id: I06e684ac4c26d1e74c9daf76753403ad15f79276
BUG: 1130308
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8486
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras/hook-scripts/set/post/S30samba-set.sh')
| -rwxr-xr-x | extras/hook-scripts/set/post/S30samba-set.sh | 42 | 
1 files changed, 23 insertions, 19 deletions
diff --git a/extras/hook-scripts/set/post/S30samba-set.sh b/extras/hook-scripts/set/post/S30samba-set.sh index 3ff368207c4..9153dcd0bb2 100755 --- a/extras/hook-scripts/set/post/S30samba-set.sh +++ b/extras/hook-scripts/set/post/S30samba-set.sh @@ -18,11 +18,12 @@  PROGNAME="Ssamba-set" -OPTSPEC="volname:" +OPTSPEC="volname:,gd-workdir:"  VOL=  CONFIGFILE=  LOGFILEBASE=  PIDDIR= +GLUSTERD_WORKDIR=  enable_smb="" @@ -32,29 +33,32 @@ function parse_args () {          while true; do              case $1 in -            --volname) -                shift -                VOL=$1 -                ;; -            *) -                shift -                for pair in $@; do +                --volname) +                    shift +                    VOL=$1 +                    ;; +                --gd-workdir) +                    shift +                    GLUSTERD_WORKDIR=$1 +                    ;; +                *) +                    shift +                    for pair in $@; do                          read key value < <(echo "$pair" | tr "=" " ")                          case "$key" in                              "user.cifs") -                                    enable_smb=$value -                                    ;; +                                enable_smb=$value +                                ;;                              "user.smb") -                                    enable_smb=$value -                                    ;; +                                enable_smb=$value +                                ;;                              *) -                                    ;; +                                ;;                          esac -                done - -                shift -                break -                ;; +                    done +                    shift +                    break +                    ;;              esac              shift          done @@ -102,7 +106,7 @@ function del_samba_share () {  function is_volume_started () {          volname=$1 -        echo "$(grep status /var/lib/glusterd/vols/"$volname"/info |\ +        echo "$(grep status $GLUSTERD_WORKDIR/vols/"$volname"/info |\                  cut -d"=" -f2)"  }  | 
