bacula-fd: new initscript

diff --git a/config/rootfiles/packages/bacula-fd b/config/rootfiles/packages/bacula-fd
index 908434795bead4e6f66d204b8938fbdcadab77fd..0a1520c844e66321489d55f1904088709533b532 100644 (file)
--- a/config/rootfiles/packages/bacula-fd
+++ b/config/rootfiles/packages/bacula-fd
@@ -1,7 +1,7 @@
 #etc/bacula
 #etc/bacula/bacula
 #etc/bacula/bacula-ctl-dir
-etc/bacula/bacula-ctl-fd
+#etc/bacula/bacula-ctl-fd
 #etc/bacula/bacula-ctl-sd
 etc/bacula/bacula-fd.conf
 #etc/bacula/bacula_config
@@ -14,7 +14,7 @@ etc/bacula/bacula-fd.conf
 #etc/bacula/dvd-handler
 #etc/bacula/mtx-changer
 #etc/bacula/mtx-changer.conf
-etc/rc.d/init.d/bacula
+etc/rc.d/init.d/bacula-fd
 usr/lib/bpipe-fd.so
 usr/lib/libbac-5.2.13.so
 #usr/lib/libbac.la

diff --git a/lfs/bacula-fd b/lfs/bacula-fd
index 32e226241aff48f3cc356302154850f7b0f1b627..ee208d31620ef95f61a675c0ffd0cf21260c2366 100644 (file)
--- a/lfs/bacula-fd
+++ b/lfs/bacula-fd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula-fd
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -84,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                --enable-client-only
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula-fd
        rm -f /root/.rnd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/bacula-fd b/src/initscripts/init.d/bacula-fd
new file mode 100644 (file)
index 0000000..cb7d594
--- /dev/null
+++ b/src/initscripts/init.d/bacula-fd
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+case "$1" in
+       start)
+               boot_mesg "Starting Bacula File Daemon"
+               loadproc /usr/sbin/bacula-fd -v -c /etc/bacula/bacula-fd.conf
+               ;;
+
+       stop)
+               boot_mesg "Stopping Bacula File Daemon"
+               killproc /usr/sbin/bacula-fd
+               ;;
+
+       restart)
+               $0 stop
+               sleep 1
+               $0 start
+               ;;
+
+       status)
+               statusproc /usr/sbin/bacula-fd
+               ;;
+
+       *)
+               echo "Usage: $0 {start|stop|restart|status}"
+               exit 1
+               ;;
+esac