From 1f1312d2463a402b7afc2f8f8f6470307fbe9ab1 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 25 Jan 2003 17:41:54 +0000 Subject: [PATCH] Apply Gentoo update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@321 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/ChangeLog | 1 + bacula/kernstodo | 10 +++--- bacula/platforms/gentoo/Makefile.in | 46 +++++------------------- bacula/platforms/gentoo/bacula-dir.in | 50 +++++++++------------------ bacula/platforms/gentoo/bacula-fd.in | 49 +++++++++----------------- bacula/platforms/gentoo/bacula-sd.in | 49 +++++++++----------------- 6 files changed, 65 insertions(+), 140 deletions(-) diff --git a/bacula/ChangeLog b/bacula/ChangeLog index fdac052fa8..f4fb0fcd86 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,3 +1,4 @@ +============================================================================= 2003-01-24 Version 1.29 released 23Jan03 - Tightened up permissions on all .conf files to be 640 so they are not diff --git a/bacula/kernstodo b/bacula/kernstodo index 75d05f151c..dca4df3e5e 100644 --- a/bacula/kernstodo +++ b/bacula/kernstodo @@ -1,5 +1,5 @@ Kern's ToDo List - 20 January 2003 + 25 January 2003 Documentation to do: (a little bit at a time) - Document running a test version. @@ -14,11 +14,10 @@ Testing to do: (painful) - that console command line options work - blocksize recognition code. -For 1.29 release: -- Add prefixlinks to where or not where absolute links (DIR part done, - do FD part in release 1.30). - For 1.30 release: +- CD into subdirectory when open()ing files for backup to + speed up things. Test with testfind(). +- Add prefixlinks to where or not where absolute links to FD. - Get correct error status from run_program or open_bpipe(). - Look at handling <> in smtp doesn't work with exim. - Priority job to go to top of list. @@ -826,4 +825,3 @@ Done: (see kernsdone for more) - Set timeout on opening fifo for save or restore (findlib) - Document FIFO storage device. - Document fifo and | and < - diff --git a/bacula/platforms/gentoo/Makefile.in b/bacula/platforms/gentoo/Makefile.in index 045ffd1023..55255993e0 100644 --- a/bacula/platforms/gentoo/Makefile.in +++ b/bacula/platforms/gentoo/Makefile.in @@ -3,6 +3,8 @@ # Makefile for the Gentoo specific installation. # # 22 January 2003 -- Kern Sibbald +# and corrected for Gentoo by +# Patrick Naubert 25 Jan 2003 # # for Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ # @@ -18,36 +20,15 @@ install-autostart: install-autostart-fd install-autostart-sd install-autostart-d install-autostart-fd: - @rm -f /etc/rc0.d/K20bacula-fd - @rm -f /etc/rc1.d/S99bacula-fd - @rm -f /etc/rc2.d/S99bacula-fd - @$(INSTALL_PROGRAM) -m 744 bacula-fd /etc/init.d/bacula-fd - # set symlinks for script at startup and shutdown - @ln -f -s /etc/init.d/bacula-fd /etc/rc0.d/K20bacula-fd - @ln -f -s /etc/init.d/bacula-fd /etc/rc1.d/S99bacula-fd - @ln -f -s /etc/init.d/bacula-fd /etc/rc2.d/S99bacula-fd + @$(INSTALL) -d -m 744 bacula-fd $(DESTDIR)/etc/init.d/bacula-fd install-autostart-sd: - @rm -f /etc/rc0.d/K20bacula-sd - @rm -f /etc/rc1.d/S99bacula-sd - @rm -f /etc/rc2.d/S99bacula-sd - @$(INSTALL_PROGRAM) -m 744 bacula-sd /etc/rc.d/init.d/bacula-sd - # set symlinks for script at startup and shutdown - @ln -f -s /etc/init.d/bacula-sd /etc/rc0.d/K20bacula-sd - @ln -f -s /etc/init.d/bacula-sd /etc/rc1.d/S99bacula-sd - @ln -f -s /etc/init.d/bacula-sd /etc/rc2.d/S99bacula-sd + @$(INSTALL) -d -m 744 bacula-sd $(DESTDIR)/etc/init.d/bacula-sd install-autostart-dir: - @rm -f /etc/rc0.d/K20bacula-dir - @rm -f /etc/rc1.d/S99bacula-dir - @rm -f /etc/rc2.d/S99bacula-dir - @$(INSTALL_PROGRAM) -m 744 bacula-dir /etc/rc.d/init.d/bacula-dir - # set symlinks for script at startup and shutdown - @ln -f -s /etc/init.d/bacula-dir /etc/rc0.d/K20bacula-dir - @ln -f -s /etc/init.d/bacula-dir /etc/rc1.d/S99bacula-dir - @ln -f -s /etc/init.d/bacula-dir /etc/rc2.d/S99bacula-dir + @$(INSTALL) -d -m 744 bacula-dir $(DESTDIR)/etc/init.d/bacula-dir uninstall: uninstall-autostart @@ -55,27 +36,18 @@ uninstall: uninstall-autostart uninstall-autostart: uninstall-autostart-fd uninstall-autostart-sd uninstall-autostart-dir uninstall-autostart-fd: - @rm -f /etc/rc0.d/K20bacula-fd - @rm -f /etc/rc1.d/S99bacula-fd - @rm -f /etc/rc2.d/S99bacula-fd - @rm -f /etc/rc.d/init.d/bacula-fd + @rm -f $(DESTDIR)/etc/init.d/bacula-fd uninstall-autostart-sd: - @rm -f /etc/rc0.d/K20bacula-sd - @rm -f /etc/rc1.d/S99bacula-sd - @rm -f /etc/rc2.d/S99bacula-sd - @rm -f /etc/rc.d/init.d/bacula-sd + @rm -f $(DESTDIR)/etc/init.d/bacula-sd uninstall-autostart-dir: - @rm -f /etc/rc0.d/K20bacula-dir - @rm -f /etc/rc1.d/S99bacula-dir - @rm -f /etc/rc2.d/S99bacula-dir - @rm -f /etc/rc.d/init.d/bacula-dir + @rm -f $(DESTDIR)/etc/init.d/bacula-dir clean: @rm -f bacula-sd bacula-fd bacula-dir distclean: clean - @rm -f Makefile bacula-*.spec + @rm -f Makefile @rm -rf CVS diff --git a/bacula/platforms/gentoo/bacula-dir.in b/bacula/platforms/gentoo/bacula-dir.in index d568cdb999..915bdbf98a 100755 --- a/bacula/platforms/gentoo/bacula-dir.in +++ b/bacula/platforms/gentoo/bacula-dir.in @@ -1,7 +1,7 @@ -#! /bin/sh +#!/sbin/runscript # # bacula This shell script takes care of starting and stopping -# the bacula Director daemon +# the bacula Director daemon for the Gentoo release # # chkconfig: 2345 20 99 # description: It comes by night and sucks the vital essence from your computers. @@ -9,36 +9,20 @@ # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ # -# Source function library -. /etc/rc.d/init.d/functions +start() { + ebegin "Starting the Bacula Director" + start-stop-daemon --start --quiet --exec @sbindir@/bacula-dir -- $2 -c @sysconfdir@/bacula-dir.conf + eend $? +} -RETVAL=0 -case "$1" in - start) - echo -n "Starting the Bacula Director: " - daemon @sbindir@/bacula-dir $2 -c @sysconfdir@/bacula-dir.conf - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-dir - ;; - stop) - echo -n "Stopping the Director daemon: " - killproc @sbindir@/bacula-dir - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-dir - ;; - restart) - $0 stop +stop() { + ebegin "Stopping the Director daemon" + start-stop-daemon --stop --quiet --exec @sbindir@/bacula-dir + eend $? +} + +restart() { + stop sleep 5 - $0 start - ;; - status) - status @sbindir@/bacula-dir - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac -exit 0 + start +} diff --git a/bacula/platforms/gentoo/bacula-fd.in b/bacula/platforms/gentoo/bacula-fd.in index 19f04f028b..7de65ef48f 100755 --- a/bacula/platforms/gentoo/bacula-fd.in +++ b/bacula/platforms/gentoo/bacula-fd.in @@ -1,7 +1,7 @@ -#! /bin/sh +#!/sbin/runscript # # bacula This shell script takes care of starting and stopping -# the bacula File daemon. +# the bacula File daemon for the Gentoo release. # # chkconfig: 2345 20 99 # description: It comes by night and sucks the vital essence from your computers. @@ -9,35 +9,20 @@ # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ # -# Source function library -. /etc/rc.d/init.d/functions +start() { + ebegin "Starting the Bacula File daemon" + start-stop-daemon --start --quiet --exec @sbindir@/bacula-fd -- $2 -c @sysconfdir@/bacula-fd.conf + eend $? +} -case "$1" in - start) - echo -n "Starting the Bacula File daemon: " - daemon @sbindir@/bacula-fd $2 -c @sysconfdir@/bacula-fd.conf - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-fd - ;; - stop) - echo -n "Stopping the Bacula File daemon: " - killproc @sbindir@/bacula-fd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-fd - ;; - restart) - $0 stop +stop() { + ebegin "Stopping the Bacula File daemon" + start-stop-daemon --stop --quiet --exec @sbindir@/bacula-fd + eend $? +} + +restart() { + stop sleep 5 - $0 start - ;; - status) - status @sbindir@/bacula-fd - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac -exit 0 + start +} diff --git a/bacula/platforms/gentoo/bacula-sd.in b/bacula/platforms/gentoo/bacula-sd.in index a4bfdd4f5a..bf6ffd490b 100755 --- a/bacula/platforms/gentoo/bacula-sd.in +++ b/bacula/platforms/gentoo/bacula-sd.in @@ -1,7 +1,7 @@ -#! /bin/sh +#!/sbin/runscript # # bacula This shell script takes care of starting and stopping -# the bacula Storage daemon. +# the bacula Storage daemon for the Gentoo release. # # chkconfig: 2345 20 99 # description: It comes by night and sucks the vital essence from your computers. @@ -9,35 +9,20 @@ # For Bacula release @VERSION@ (@DATE@) -- @DISTNAME@ # -# Source function library -. /etc/rc.d/init.d/functions +start() { + ebegin "Starting the Bacula Storage daemon" + start-stop-daemon --start --quiet --exec @sbindir@/bacula-sd -- $2 -c @sysconfdir@/bacula-sd.conf + eend $? +} -case "$1" in - start) - echo -n "Starting the Bacula Storage daemon: " - daemon @sbindir@/bacula-sd $2 -c @sysconfdir@/bacula-sd.conf - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch @subsysdir@/bacula-sd - ;; - stop) - echo -n "Stopping the Bacula Storage daemon: " - killproc @sbindir@/bacula-sd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f @subsysdir@/bacula-sd - ;; - restart) - $0 stop +stop() { + ebegin "Stopping the Bacula Storage daemon" + start-stop-daemon --stop --quiet --exec @sbindir@/bacula-sd + eend $? +} + +restart() { + stop sleep 5 - $0 start - ;; - status) - status @sbindir@/bacula-sd - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac -exit 0 + start +} -- 2.39.5