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/start/post/S30samba-start.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/start/post/S30samba-start.sh')
| -rwxr-xr-x | extras/hook-scripts/start/post/S30samba-start.sh | 33 | 
1 files changed, 19 insertions, 14 deletions
diff --git a/extras/hook-scripts/start/post/S30samba-start.sh b/extras/hook-scripts/start/post/S30samba-start.sh index 34fde0ef8c0..43dc8e108da 100755 --- a/extras/hook-scripts/start/post/S30samba-start.sh +++ b/extras/hook-scripts/start/post/S30samba-start.sh @@ -21,28 +21,33 @@  #volume.  PROGNAME="Ssamba-start" -OPTSPEC="volname:" +OPTSPEC="volname:,gd-workdir:"  VOL=  CONFIGFILE=  LOGFILEBASE=  PIDDIR= +GLUSTERD_WORKDIR=  function parse_args () {          ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@)          eval set -- "$ARGS"          while true; do -        case $1 in -        --volname) -         shift -         VOL=$1 -         ;; -        *) -         shift -         break -         ;; -        esac -        shift +            case $1 in +                --volname) +                    shift +                    VOL=$1 +                    ;; +                --gd-workdir) +                    shift +                    GLUSTERD_WORKDIR=$1 +                    ;; +                *) +                    shift +                    break +                    ;; +            esac +            shift          done  } @@ -85,9 +90,9 @@ function get_smb () {          volname=$1          uservalue= -        usercifsvalue=$(grep user.cifs /var/lib/glusterd/vols/"$volname"/info |\ +        usercifsvalue=$(grep user.cifs $GLUSTERD_WORKDIR/vols/"$volname"/info |\                          cut -d"=" -f2) -        usersmbvalue=$(grep user.smb /var/lib/glusterd/vols/"$volname"/info |\ +        usersmbvalue=$(grep user.smb $GLUSTERD_WORKDIR/vols/"$volname"/info |\                         cut -d"=" -f2)          if [[ $usercifsvalue = "disable" || $usersmbvalue = "disable" ]]; then  | 
