From ac62c953e499dca873fbf808b95df0feb50bda27 Mon Sep 17 00:00:00 2001
From: Raghavendra Talur <rtalur@redhat.com>
Date: Mon, 24 Jun 2013 02:57:07 +0530
Subject: extras/hook-scripts: Set of changes for new samba share method.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New method of creating a share of gluster volume
through samba eliminates the requirement of fuse
mount and changes in fstab.

glusterfs vfs plugin has to be specified as required
vfs object.
Path now is relative to the root of gluster volume.
/ signifies complete volume.

Change-Id: I3d80452cd58513ef59d6a816c1ab62ebc3b76a62
BUG: 953694
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-on: http://review.gluster.org/5247
Reviewed-by: José Rivera <jrivera@redhat.com>
Tested-by: José Rivera <jrivera@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 extras/hook-scripts/S30samba-stop.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'extras/hook-scripts/S30samba-stop.sh')

diff --git a/extras/hook-scripts/S30samba-stop.sh b/extras/hook-scripts/S30samba-stop.sh
index 7e05c2111..def87e00e 100755
--- a/extras/hook-scripts/S30samba-stop.sh
+++ b/extras/hook-scripts/S30samba-stop.sh
@@ -1,11 +1,23 @@
 #! /bin/bash
-#Need to be copied to hooks/<HOOKS_VER>/stop/post
+
+#Need to be copied to hooks/<HOOKS_VER>/stop/pre
+
+#TODO: All gluster and samba paths are assumed for fedora like systems.
+#Some efforts are required to make it work on other distros.
+
+#The preferred way of creating a smb share of a gluster volume has changed.
+#The old method was to create a fuse mount of the volume and share the mount
+#point through samba.
+#
+#New method eliminates the requirement of fuse mount and changes in fstab.
+#glusterfs_vfs plugin for samba makes call to libgfapi to access the volume.
+#
+#This hook script automagically removes shares for volume on every volume stop
+#event by removing the volume related entries(if any) in smb.conf file.
 
 PROGNAME="Ssamba-stop"
-OPTSPEC="volname:,mnt:"
+OPTSPEC="volname:"
 VOL=
-#FIXME: gluster will eventually pass mnt prefix as command line argument
-MNT_PRE="/mnt/samba"
 
 function parse_args () {
         ARGS=$(getopt -l $OPTSPEC  -name $PROGNAME $@)
@@ -17,11 +29,6 @@ function parse_args () {
          shift
          VOL=$1
          ;;
-        --mnt)
-         shift
-         MNT_PRE=$1
-         echo $1
-         ;;
         *)
          shift
          break
@@ -31,19 +38,13 @@ function parse_args () {
         done
 }
 
-function del_samba_export () {
+function del_samba_share () {
         volname=$1
         cp /etc/samba/smb.conf /tmp/smb.conf
         sed -i "/gluster-$volname/,/^$/d" /tmp/smb.conf &&\
                 cp /tmp/smb.conf /etc/samba/smb.conf
 }
 
-function umount_volume () {
-        volname=$1
-        mnt_pre=$2
-        umount -l $mnt_pre/$volname
-}
-
 function sighup_samba () {
         pid=`cat /var/run/smbd.pid`
         if [ $pid != "" ]
@@ -55,6 +56,5 @@ function sighup_samba () {
 }
 
 parse_args $@
-del_samba_export $VOL
-umount_volume $VOL $MNT_PRE
+del_samba_share $VOL
 sighup_samba
-- 
cgit