pound: Update initscript.

diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound
index 45e218b14045b301e5916bfbc6b319f7ad90287b..a935172a73d93effb7646cc3473d5e25b4fa89c7 100644 (file)
--- a/config/rootfiles/packages/pound
+++ b/config/rootfiles/packages/pound
@@ -1,8 +1,10 @@
-#root/.rnd
+etc/rc.d/init.d/pound
+etc/rc.d/rc0.d/K40pound
+etc/rc.d/rc3.d/S60pound
+etc/rc.d/rc6.d/K40pound
 #etc/pound.cfg
 usr/sbin/pound
 usr/sbin/poundctl
 #usr/share/man/man8/pound.8
 #usr/share/man/man8/poundctl.8
 var/ipfire/backup/addons/includes/pound
-etc/rc.d/init.d/pound

diff --git a/lfs/pound b/lfs/pound
index f2a7f5fecd821d2eff9a249ebeaa0170598a7976..9305f4595239d7c4fc5ea8121f38d3535517e7c9 100644 (file)
--- a/lfs/pound
+++ b/lfs/pound
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pound
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -84,5 +84,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
        install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
                         /var/ipfire/backup/addons/includes/pound
+       ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60pound
+       ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40pound
+       ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40pound
+
+       # Remove temporary file.
+       rm -vf /root/.rnd
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/pound b/src/initscripts/init.d/pound
index 185ad61f65692e317d6ca43caa7af06f76d60845..86a73d8e54abb69e61b779e548b3975097c01492 100644 (file)
--- a/src/initscripts/init.d/pound
+++ b/src/initscripts/init.d/pound
@@ -1,43 +1,23 @@
 #!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/pound
+#
+# Description : pound reverse-proxy
+#
+########################################################################
 
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-test -x /usr/sbin/pound || exit 0
-
-# For configuration of the init script use the file
-# /etc/sysconfig/pound, do not edit this init script.
-
-# Set run_pound to 1 to start pound or 0 to disable it.
-run_pound=0
-
-# Specify additional pound options here (see manpage).
-pound_options=""
-
-# Specify module to load
-pound_module="none"
-
-[ -e /etc/sysconfig/pound ] && . /etc/sysconfig/pound
-
-DAEMON=/usr/sbin/pound
-
 case "${1}" in
        start)
-               boot_mesg "Starting pound ..."
-               if [ $run_pound = 1 ]
-               then
-                       # do we have to load a module?
-                       [ ${pound_module:-none} != "none" ] && /sbin/modprobe $pound_module
-
-                       loadproc $DAEMON $pound_options
-               fi
+               boot_mesg "Starting pound reverse-proxy..."
+               loadproc /usr/sbin/pound
                ;;
 
        stop)
-               boot_mesg "Stopping pound ..."
-               killproc $DAEMON
+               boot_mesg "Stopping pound reverse-proxy..."
+               killproc /usr/sbin/pound
                ;;
 
        restart)
@@ -47,7 +27,7 @@ case "${1}" in
                ;;
 
        status)
-               statusproc $DAEMON
+               statusproc /usr/sbin/pound
                ;;
 
        *)
@@ -56,3 +36,4 @@ case "${1}" in
                ;;
 esac
 
+# End $rc_base/init.d/pound