From 025ae07850375cbf981ed335a4ddf702d54be6e3 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@harshavardhana.net>
Date: Thu, 14 Aug 2014 13:06:26 -0700
Subject: 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>
---
 .../post/disabled-quota-root-xattr-heal.sh         | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh')

diff --git a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
index 1866f6abd7e..d18367fc9df 100755
--- a/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
+++ b/extras/hook-scripts/add-brick/post/disabled-quota-root-xattr-heal.sh
@@ -18,7 +18,7 @@ PROGNAME="Quota-xattr-heal-add-brick"
 VOL_NAME=
 VERSION=
 VOLUME_OP=
-GLUSTERD_WORKING_DIR=
+GLUSTERD_WORKDIR=
 ENABLED_NAME="S28Quota-root-xattr-heal.sh"
 
 
@@ -45,33 +45,33 @@ eval set -- "$ARGS"
 
 while true;
 do
-        case $1 in
+    case $1 in
         --volname)
-                 shift
-                 VOL_NAME=$1
-                 ;;
+            shift
+            VOL_NAME=$1
+            ;;
         --version)
-                 shift
-                 VERSION=$1
-                 ;;
-         --gd-workdir)
-                 shift
-                 GLUSTERD_WORKING_DIR=$1
-                 ;;
-         --volume-op)
-                 shift
-                 VOLUME_OP=$1
-                 ;;
+            shift
+            VERSION=$1
+            ;;
+        --gd-workdir)
+            shift
+            GLUSTERD_WORKDIR=$1
+            ;;
+        --volume-op)
+            shift
+            VOLUME_OP=$1
+            ;;
         *)
-                 shift
-                 break
-                 ;;
-        esac
-        shift
+            shift
+            break
+            ;;
+    esac
+    shift
 done
 ##----------------------------------------
 
-ENABLED_STATE="$GLUSTERD_WORKING_DIR/hooks/$VERSION/$VOLUME_OP/post/$ENABLED_NAME"
+ENABLED_STATE="$GLUSTERD_WORKDIR/hooks/$VERSION/$VOLUME_OP/post/$ENABLED_NAME"
 
 
 FLAG=`gluster volume quota $VOL_NAME list / 2>&1 | grep \
-- 
cgit