Fix Copyright on init scripts suse, add specific daemon user & group

Signed-off-by: Marco van Wieringen <mvw@planets.elm.net>

diff --git a/bacula/platforms/suse/bacula-dir.in b/bacula/platforms/suse/bacula-dir.in
index 550b9ceff335102677a7294f24559234df38e9ee..fc995cb4507c40059f2ffebd1183b608cb5a35d5 100755 (executable)
--- a/bacula/platforms/suse/bacula-dir.in
+++ b/bacula/platforms/suse/bacula-dir.in
@@ -7,15 +7,17 @@
 # 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 $network @DEFAULT_DB_TYPE@
-# Required-Stop:               $local_fs $network @DEFAULT_DB_TYPE@
-# Default-Start:               3 5
+# Required-Start:      $local_fs $remote_fs $network
+# Required-Stop:       $local_fs $remote_fs $network
+# Default-Start:       3 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   bacula director
 # Description:                 Bacula network backup system director daemon
@@ -29,7 +31,7 @@ RETVAL=0
 case "$1" in
     start)
        echo -n "Starting the Bacula Director: "
-       /sbin/startproc @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
+       /sbin/startproc @sbindir@/bacula-dir $2 -u @dir_user@ -g @dir_group@ -c @sysconfdir@/bacula-dir.conf
        RETVAL=$?
        rc_status -v
        echo

diff --git a/bacula/platforms/suse/bacula-fd.in b/bacula/platforms/suse/bacula-fd.in
index c14dd2e9c1c99f8bf8a7f526becf48ca96ccf3f4..e8618ddf556d6a14b9aa37de0939a5bdc1002315 100755 (executable)
--- a/bacula/platforms/suse/bacula-fd.in
+++ b/bacula/platforms/suse/bacula-fd.in
@@ -7,15 +7,17 @@
 # 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-fd
-# Required-Start:              $local_fs $network
-# Required-Stop:               $local_fs $network
-# Default-Start:               3 5
+# Required-Start:      $local_fs $remote_fs $network
+# Required-Stop:       $local_fs $remote_fs $network
+# Default-Start:       3 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   bacula file daemon
 # Description:                 Bacula network backup system file daemon
@@ -28,7 +30,7 @@
 case "$1" in
     start)
        echo -n "Starting the Bacula File daemon: "
-       /sbin/startproc @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
+       /sbin/startproc @sbindir@/bacula-fd $2 -u @fd_user@  -g @fd_group@  -c @sysconfdir@/bacula-fd.conf
        RETVAL=$?
        rc_status -v
        echo

diff --git a/bacula/platforms/suse/bacula-sd.in b/bacula/platforms/suse/bacula-sd.in
index d2b3afd54011da772715266897de03bb0ff5f68c..7a61784d585ad3344d3b17e33acebc77c22f6457 100755 (executable)
--- a/bacula/platforms/suse/bacula-sd.in
+++ b/bacula/platforms/suse/bacula-sd.in
@@ -7,14 +7,16 @@
 # 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 $network
-# Required-Stop:               $local_fs $network
+# Required-Start:              $local_fs $remote_fs $network
+# Required-Stop:               $local_fs $remote_fs $network
 # Default-Start:               3 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   bacula storage daemon
@@ -28,7 +30,7 @@
 case "$1" in
     start)
        echo -n "Starting the Bacula Storage daemon: "
-       /sbin/startproc @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
+       /sbin/startproc @sbindir@/bacula-sd $2 -u @sd_user@ -g @sd_group@ -c @sysconfdir@/bacula-sd.conf
        RETVAL=$?
        rc_status -v
        echo