Backport copyright changes

[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 c5a3a93c32f3b25df50c87b5a706c6d31362e909..05fc64cca81c20342c04a21928600ac406af5e4e 100755 (executable)
--- a/bacula/platforms/solaris/bacula-dir.in
+++ b/bacula/platforms/solaris/bacula-dir.in
@@ -1,26 +1,29 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Copyright (C) Kern Sibbald 2000-2015
+# License: BSD 2-Clause
 #
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
-# chkconfig: 2345 92 9
 # description: The Leading Open Source Backup Solution.
 #
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
+# 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}"
+       if [ ! -z "${DIR_USER}" ]; then
+         [ -z "${DIR_OPTIONS}" ] && DIR_OPTIONS="-u ${DIR_USER}" || \
+                                    DIR_OPTIONS="${DIR_OPTIONS} -u ${DIR_USER}"
        fi
-       if [ "${DIR_GROUP}" != '' ]; then
-          DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}"
+       if [ ! -z "${DIR_GROUP}" ]; then
+         [ -z "${DIR_OPTIONS}" ] && DIR_OPTIONS="-g ${DIR_GROUP}" || \
+                                    DIR_OPTIONS="${DIR_OPTIONS} -g ${DIR_GROUP}"
        fi
 
        echo "Starting the Bacula Director: "
@@ -28,7 +31,18 @@ case "$1" in
        ;;
     stop)
        echo "Stopping the Director daemon: "
-       pkill -x bacula-dir
+       if [ -x /usr/bin/zonename ]; then
+         case `/usr/bin/zonename` in
+            global)
+               pkill -z global -x bacula-dir
+               ;;
+            *)
+               pkill -x bacula-dir
+               ;;
+         esac
+       else
+         pkill -x bacula-dir
+       fi
        ;;
     restart)
        $0 stop