Backport from Bacula Enterprise

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

diff --git a/bacula/platforms/suse/bacula-dir.in b/bacula/platforms/suse/bacula-dir.in
index fc995cb4507c40059f2ffebd1183b608cb5a35d5..16e9edda892842650b3eb3374d9e8020a71b7f39 100755 (executable)
--- a/bacula/platforms/suse/bacula-dir.in
+++ b/bacula/platforms/suse/bacula-dir.in
@@ -1,5 +1,8 @@
 #! /bin/sh
 #
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 # bacula       This shell script takes care of starting and stopping
 #             the bacula Director daemon
 #
@@ -7,17 +10,15 @@
 # description: The Leading Open Source Backup Solution.
 #
 #  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
-# Copyright (C) 2011 Free Software Foundation Europe e.V.
 # Modified to work on SuSE 1/31/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 # Added rc.status functions 3/13/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 # Added LSB init info 10/14/2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
-# Added $remote_fs, add bacula specific daemon user & group Bruno Friedmann <bruno@ioda-net.ch>
 #
 ### BEGIN INIT INFO
 # Provides:                    bacula-dir
-# Required-Start:      $local_fs $remote_fs $network
-# Required-Stop:       $local_fs $remote_fs $network
-# Default-Start:       3 5
+# Required-Start:              $local_fs $network @DEFAULT_DB_TYPE@
+# Required-Stop:               $local_fs $network @DEFAULT_DB_TYPE@
+# Default-Start:               3 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   bacula director
 # Description:                 Bacula network backup system director daemon
@@ -31,7 +32,7 @@ RETVAL=0
 case "$1" in
     start)
        echo -n "Starting the Bacula Director: "
-       /sbin/startproc @sbindir@/bacula-dir $2 -u @dir_user@ -g @dir_group@ -c @sysconfdir@/bacula-dir.conf
+       /sbin/startproc @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
        RETVAL=$?
        rc_status -v
        echo
@@ -49,6 +50,7 @@ case "$1" in
        $0 stop
        sleep 5
        $0 start
+       RETVAL=$?
        ;;
     status)
        /sbin/checkproc @sbindir@/bacula-dir