diff options
| author | Krishnan Parthasarathi <kp@gluster.com> | 2012-05-29 01:33:31 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-06-12 14:39:49 +0530 |
| commit | 7fb03a0ade154b0c21a71ce0e776a06e50510016 (patch) | |
| tree | 51f3b201036c2cad207ddd09ba732b08af8b6c24 /extras | |
| parent | 7ded1a6e11dae194f04d8717125ff5c18066731e (diff) | |
extras: Restructuring hook-scripts directory
- Fixed permissions of samba-start and samba-stop scripts
- Fixed string comparison in sighup_samba function
Change-Id: I5529cf2f4d7c08ac8fafcf64652be856345c9476
BUG: 806996
Signed-off-by: Krishnan Parthasarathi <kp@gluster.com>
Signed-off-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/hook-scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/hook-scripts/start/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/start/post/Makefile.am | 1 | ||||
| -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 |
6 files changed, 7 insertions, 3 deletions
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 |