- update for PLD

Changed files:
    bacula-dir.init -> 1.2
    bacula-fd.init -> 1.2
    bacula-sd.init -> 1.2

diff --git a/bacula-dir.init b/bacula-dir.init
index 61b3b29e7c0018445fcb0f866e8fb58fc9eba6d4..dab25a92b176c1c4a8124ab06ef5f071bb226913 100644 (file)
--- a/bacula-dir.init
+++ b/bacula-dir.init
@@ -6,8 +6,6 @@
 # chkconfig: 2345 92 99
 # description: It comes by night and sucks the vital essence from your computers.
 #
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
-#
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -15,30 +13,29 @@
 RETVAL=0
 case "$1" in
     start)
-       echo -n "Starting the Bacula Director: "
-       daemon @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf
+       msg_starting "Bacula Director"
+       daemon /usr/sbin//bacula-dir $2 -c /etc/bacula/bacula-dir.conf
        RETVAL=$?
        echo
-       [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-dir
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-dir
        ;;
     stop)
-       echo -n "Stopping the Director daemon: "
-       killproc @sbindir@/bacula-dir
+       msg_stopping "Director daemon"
+       killproc /usr/sbin//bacula-dir
        RETVAL=$?
-       echo
-       [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-dir
+       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-dir
        ;;
     restart)
-       $0 stop
-       sleep 5
+       $0 stop && sleep 5
        $0 start
+       RETVAL=$?
        ;;
     status)
-       status @sbindir@/bacula-dir
+       status /usr/sbin/bacula-dir
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"
        exit 1
        ;;
 esac
-exit 0
+exit $RETVAL

diff --git a/bacula-fd.init b/bacula-fd.init
index 7d3e7c0980286b7c178920207362660dec826473..357929da441474d93c231581f97bf9bbc6e9c581 100644 (file)
--- a/bacula-fd.init
+++ b/bacula-fd.init
@@ -6,38 +6,35 @@
 # chkconfig: 2345 91 99
 # description: It comes by night and sucks the vital essence from your computers.
 #
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
-#
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
 case "$1" in
     start)
-       echo -n "Starting the Bacula File daemon: "
-       daemon @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf
+       msg_starting "Bacula File daemon"
+       daemon /usr/sbin/bacula-fd $2 -c /etc/bacula/bacula-fd.conf
        RETVAL=$?
-       echo
-       [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-fd
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bacula-fd
        ;;
     stop)
-       echo -n "Stopping the Bacula File daemon: "
-       killproc @sbindir@/bacula-fd
+       msg_stopping "Bacula File daemon"
+       killproc /usr/sbin/bacula-fd
        RETVAL=$?
        echo
-       [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-fd
+       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-fd
        ;;
     restart)
-       $0 stop
-       sleep 5
+       $0 stop && sleep 5
        $0 start
+       RETVAL=$?
        ;;
     status)
-       status @sbindir@/bacula-fd
+       status /usr/sbin/bacula-fd
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"
        exit 1
        ;;
 esac
-exit 0
+exit $RETVAL

diff --git a/bacula-sd.init b/bacula-sd.init
index e58287625d338a806b1b1cdbae54ca4786577f9b..c01e5de7593e96311f29580132fada5b60a79b81 100644 (file)
--- a/bacula-sd.init
+++ b/bacula-sd.init
@@ -6,38 +6,34 @@
 # chkconfig: 2345 90 99
 # description: It comes by night and sucks the vital essence from your computers.
 #
-#  For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@
-#
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
 case "$1" in
     start)
-       echo -n "Starting the Bacula Storage daemon: "
-       daemon @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf
+       msg_starting "Bacula Storage daemon"
+       daemon /usr/sbin/bacula-sd $2 -c /etc/bacula/bacula-sd.conf
        RETVAL=$?
-       echo
        [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-sd
        ;;
     stop)
-       echo -n "Stopping the Bacula Storage daemon: "
-       killproc @sbindir@/bacula-sd
+       msg_stopping "Bacula Storage daemon"
+       killproc /usr/sbin/bacula-sd
        RETVAL=$?
-       echo
-       [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-sd
+       [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bacula-sd
        ;;
     restart)
-       $0 stop
-       sleep 5
+       $0 stop && sleep 5
        $0 start
+       RETVAL=$?
        ;;
     status)
-       status @sbindir@/bacula-sd
+       status /usr/sbin/bacula-sd
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|status}"
        exit 1
        ;;
 esac
-exit 0
+exit $RETVAL