summaryrefslogtreecommitdiffstats
path: root/extras/hook-scripts/start/post/S30samba-start.sh
diff options
context:
space:
mode:
authorKrishnan Parthasarathi <kparthas@redhat.com>2012-08-16 12:53:47 +0530
committerVijay Bellur <vbellur@redhat.com>2012-12-12 00:12:58 -0500
commite8013c280e3a9f79490b39e51fd8c24ad39a5a04 (patch)
tree57fd04a1ad7eb2f811236a19b461857e55d9b4bb /extras/hook-scripts/start/post/S30samba-start.sh
parentc2d72cb5bd9084786ceff03e4df032541461e183 (diff)
hooks: Modified samba hook scripts to handle user.cifs
Change-Id: I079636e2be4bc097df33355b6a60c0e04d69ef57 BUG: 877992 Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-on: https://code.engineering.redhat.com/gerrit/1856 Reviewed-by: Vijay Bellur <vbellur@redhat.com> Tested-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'extras/hook-scripts/start/post/S30samba-start.sh')
-rw-r--r--extras/hook-scripts/start/post/S30samba-start.sh24
1 files changed, 20 insertions, 4 deletions
diff --git a/extras/hook-scripts/start/post/S30samba-start.sh b/extras/hook-scripts/start/post/S30samba-start.sh
index 5323cca76d5..70158e75590 100644
--- a/extras/hook-scripts/start/post/S30samba-start.sh
+++ b/extras/hook-scripts/start/post/S30samba-start.sh
@@ -33,9 +33,9 @@ function add_samba_export () {
function sighup_samba () {
pid=`cat /var/run/smbd.pid`
- if [ $pid != " " ]
+ if [ "$pid" != "" ]
then
- kill -HUP $pid;
+ kill -HUP "$pid";
else
/etc/init.d/smb condrestart
fi
@@ -52,11 +52,27 @@ function add_fstab_entry () {
fi
}
+function get_cifs () {
+ volname=$1
+ echo "$(grep user.cifs /var/lib/glusterd/vols/"$volname"/info | cut -d"=" -f2)"
+}
+
+function mount_volume () {
+ volname=$1
+ mntpt=$2
+ if [ "$(cat /proc/mounts | grep "$mntpt")" == "" ]; then
+ mount -t glusterfs `hostname`:$volname $mntpt && \
+ add_fstab_entry $volname $mntpt
+ fi
+}
parse_args $@
+if [ $(get_cifs "$VOL") = "disable" ]; then
+ exit 0
+fi
+
add_samba_export $VOL $MNT_PRE
mkdir -p $MNT_PRE/$VOL
sleep 5
-mount -t glusterfs `hostname`:$VOL $MNT_PRE/$VOL && \
- add_fstab_entry $VOL $MNT_PRE/$VOL
+mount_volume $VOL $MNT_PRE/$VOL
sighup_samba