summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--extras/hook-scripts/Makefile.am3
-rw-r--r--extras/hook-scripts/start/Makefile.am2
-rw-r--r--extras/hook-scripts/start/post/Makefile.am1
-rw-r--r--extras/hook-scripts/start/post/S29CTDBsetup.sh (renamed from extras/hook-scripts/S29CTDBsetup.sh)0
-rw-r--r--[-rwxr-xr-x]extras/hook-scripts/start/post/S30samba-start.sh (renamed from extras/hook-scripts/S30samba-start.sh)2
-rw-r--r--[-rwxr-xr-x]extras/hook-scripts/start/post/S30samba-stop.sh (renamed from extras/hook-scripts/S30samba-stop.sh)2
7 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 893a47f8e1d..63ccb255238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -134,6 +134,8 @@ AC_CONFIG_FILES([Makefile
extras/init.d/glusterd-SuSE
extras/benchmarking/Makefile
extras/hook-scripts/Makefile
+ extras/hook-scripts/start/Makefile
+ extras/hook-scripts/start/post/Makefile
contrib/fuse-util/Makefile
contrib/uuid/uuid_types.h
xlators/nfs/Makefile
diff --git a/extras/hook-scripts/Makefile.am b/extras/hook-scripts/Makefile.am
index 5c6249de707..2fa5f137a5d 100644
--- a/extras/hook-scripts/Makefile.am
+++ b/extras/hook-scripts/Makefile.am
@@ -1 +1,2 @@
-EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh S30samba-stop.sh
+SUBDIRS = start
+CLEANFILES =
diff --git a/extras/hook-scripts/start/Makefile.am b/extras/hook-scripts/start/Makefile.am
new file mode 100644
index 00000000000..1fcade4b07f
--- /dev/null
+++ b/extras/hook-scripts/start/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = post
+CLEANFILES =
diff --git a/extras/hook-scripts/start/post/Makefile.am b/extras/hook-scripts/start/post/Makefile.am
new file mode 100644
index 00000000000..5c6249de707
--- /dev/null
+++ b/extras/hook-scripts/start/post/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh S30samba-stop.sh
diff --git a/extras/hook-scripts/S29CTDBsetup.sh b/extras/hook-scripts/start/post/S29CTDBsetup.sh
index e256be1f3ea..e256be1f3ea 100644
--- a/extras/hook-scripts/S29CTDBsetup.sh
+++ b/extras/hook-scripts/start/post/S29CTDBsetup.sh
diff --git a/extras/hook-scripts/S30samba-start.sh b/extras/hook-scripts/start/post/S30samba-start.sh
index a42bb07eba8..5c7b6574e36 100755..100644
--- a/extras/hook-scripts/S30samba-start.sh
+++ b/extras/hook-scripts/start/post/S30samba-start.sh
@@ -47,7 +47,7 @@ function mount_volume () {
function sighup_samba () {
pid=`cat /var/run/smbd.pid`
- if [ $pid != "" ]
+ if [ $pid != " " ]
then
kill -HUP $pid;
else
diff --git a/extras/hook-scripts/S30samba-stop.sh b/extras/hook-scripts/start/post/S30samba-stop.sh
index 0e483bff835..0886f91bf9d 100755..100644
--- a/extras/hook-scripts/S30samba-stop.sh
+++ b/extras/hook-scripts/start/post/S30samba-stop.sh
@@ -46,7 +46,7 @@ function umount_volume () {
function sighup_samba () {
pid=`cat /var/run/smbd.pid`
- if [ $pid != "" ]
+ if [ $pid != " " ]
then
kill -HUP $pid;
else