Backport from Bacula Enterprise

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

diff --git a/bacula/platforms/suse/bacula-sd.in b/bacula/platforms/suse/bacula-sd.in
index 7a61784d585ad3344d3b17e33acebc77c22f6457..0444ff49343ce3b49e75902e4a5b66de0e54cca1 100755 (executable)
--- a/bacula/platforms/suse/bacula-sd.in
+++ b/bacula/platforms/suse/bacula-sd.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 Storage daemon.
 #
@@ -7,16 +10,14 @@
 # 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-sd
-# Required-Start:              $local_fs $remote_fs $network
-# Required-Stop:               $local_fs $remote_fs $network
+# Required-Start:              $local_fs $network
+# Required-Stop:               $local_fs $network
 # Default-Start:               3 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   bacula storage daemon
@@ -27,10 +28,11 @@
 # this gives us funtion rc_status -v to tell us if we succeed or fail
 . /etc/rc.status
 
+RETVAL=0
 case "$1" in
     start)
        echo -n "Starting the Bacula Storage daemon: "
-       /sbin/startproc @sbindir@/bacula-sd $2 -u @sd_user@ -g @sd_group@ -c @sysconfdir@/bacula-sd.conf
+       /sbin/startproc @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
        RETVAL=$?
        rc_status -v
        echo
@@ -48,6 +50,7 @@ case "$1" in
        $0 stop
        sleep 5
        $0 start
+       RETVAL=$?
        ;;
     status)
        /sbin/checkproc @sbindir@/bacula-sd