Make the solaris init scripts user/group aware

[bacula/bacula] / bacula / platforms / solaris / bacula-dir.in

diff --git a/bacula/platforms/solaris/bacula-dir.in b/bacula/platforms/solaris/bacula-dir.in
index bd433b162555d73399da9356321a326b3f64e527..c5a3a93c32f3b25df50c87b5a706c6d31362e909 100755 (executable)
--- a/bacula/platforms/solaris/bacula-dir.in
+++ b/bacula/platforms/solaris/bacula-dir.in
@@ -4,26 +4,31 @@
 #             the bacula Director daemon
 #
 # chkconfig: 2345 92 9
-# description: It comes by night and sucks the vital essence from your computers.
+# description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
 #
 
+DIR_USER=@dir_user@
+DIR_GROUP=@dir_group@
+DIR_OPTIONS=''
+
 RETVAL=0
 case "$1" in
     start)
+       if [ "${DIR_USER}" != '' ]; then
+          DIR_OPTIONS="${DIR_OPTIONS} -u ${DIR_USER}"
+       fi
+       if [ "${DIR_GROUP}" != '' ]; then
+          DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}"
+       fi
+
        echo "Starting the Bacula Director: "
-       @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
-       RETVAL=$?
-       echo
-       [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-dir
+       @sbindir@/bacula-dir $2 ${DIR_OPTIONS} -c @sysconfdir@/bacula-dir.conf
        ;;
     stop)
        echo "Stopping the Director daemon: "
-#      killproc @sbindir@/bacula-dir
-       RETVAL=$?
-       echo
-       [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-dir
+       pkill -x bacula-dir
        ;;
     restart)
        $0 stop