[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e133f653c735502e0d82990d6a60846b2000757

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8e133f653c735502e0d82990d6a60846b2000757

[git]

[-- Attachment #1: Type: text/plain, Size: 4133 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  8e133f653c735502e0d82990d6a60846b2000757 (commit)
      from  6c6cfa1e04de2539411add9266b22cfd46cf0d50 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8e133f653c735502e0d82990d6a60846b2000757
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon May 27 21:35:48 2013 +0200

    pound: Update initscript.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/packages/pound |  6 ++++--
 lfs/pound                       |  9 ++++++++-
 src/initscripts/init.d/pound    | 43 ++++++++++++-----------------------------
 3 files changed, 24 insertions(+), 34 deletions(-)

Difference in files:
diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound
index 45e218b..a935172 100644
--- 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 f2a7f5f..9305f45 100644
--- 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 185ad61..86a73d8 100644
--- 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


hooks/post-receive
--
IPFire 2.x development tree