Fix dhcrelay startup script for proper commandline arguments and proper shutdown pidfile. Fixes bug #48207.

4 files changed, 18 insertions, 9 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index be7f61d42f48..70f08e510c67 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.47 2004/12/20 18:54:23 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.48 2004/12/20 19:21:39 max Exp $
+
+  20 Dec 2004; <max@gentoo.org> files/dhcrelay.conf, files/dhcrelay.rc6:
+  Fix dhcrelay startup script for proper commandline arguments and proper
+  shutdown pidfile. Fixes bug #48207.
 
 *dhcp-3.0.1-r1 (20 Dec 2004)
 
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 45d558f633b9..4bbb980b60cd 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,13 +1,13 @@
 MD5 7d50e4a39640d74b9a0bedf1c5b57705 dhcp-3.0.1.ebuild 3986
 MD5 5c70d7e7d70c93d7216fa62875c7339c dhcp-3.0.1-r1.ebuild 4024
-MD5 b0c9c321be7d49bd5b7164ccc09c6b6a ChangeLog 7983
+MD5 a5cc5fc410841a86862d76b2e71dfa25 ChangeLog 8169
 MD5 9384ae7ba3e9f56b8027ea92f607042d metadata.xml 215
 MD5 5cde0a8fdf363490c4212726dfd06a38 files/dhcp.conf 769
 MD5 ca45269300d74a3a8750e0e64e8d92ea files/dhcp-3.0.1-fix-invalid-attribute.patch 583
 MD5 7f1859e6517a23f87c8e83c68a15a537 files/digest-dhcp-3.0.1-r1 62
-MD5 c2433edf6a800843b0d55c9086de1252 files/dhcrelay.rc6 564
+MD5 8a19dd005c33231e02c03659f0c658df files/dhcrelay.rc6 626
 MD5 66becf9870e0293bbd35d1fba770751a files/dhcp-3.0+paranoia.patch 5366
 MD5 7f1859e6517a23f87c8e83c68a15a537 files/digest-dhcp-3.0.1 62
-MD5 1a902e3332707119032d7bc229b91001 files/dhcrelay.conf 505
+MD5 6c69efa2b41915ec59e53bb065ac3d0c files/dhcrelay.conf 502
 MD5 81b9256728a5daab31f0513ab55e8354 files/dhcp.rc6 1092
 MD5 d909d81a4d4ea39ddfc9898d33488c73 files/dhcp-3.0pl2-fix-perms.patch 485
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
index 5872747867c8..2b7f91a39efe 100644
--- a/net-misc/dhcp/files/dhcrelay.conf
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.3 2004/07/14 23:56:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.conf,v 1.4 2004/12/20 19:21:39 max Exp $
 
 # Configure which interface or interfaces to for dhcp to listen on
 # list all interfaces space separated.
 IFACE="eth0"
 
 # Insert any other options needed.  See dhcrelay(8) for details.
-DHCRELAY_OPTS=""
+DHCRELAY_OPTS="-q"
 
 # Space separated list of IPs to forward BOOTP/DHCP packets to.
 DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay.rc6 b/net-misc/dhcp/files/dhcrelay.rc6
index d1abe093c23f..f7abb69e06c9 100644
--- a/net-misc/dhcp/files/dhcrelay.rc6
+++ b/net-misc/dhcp/files/dhcrelay.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.4 2004/07/14 23:56:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.rc6,v 1.5 2004/12/20 19:21:39 max Exp $
 
 depend() {
 	need net
@@ -9,15 +9,20 @@ depend() {
 }
 
 start() {
+	local IFACES=""
+	for i in ${IFACE} ; do
+		IFACES="${IFACES} -i ${i}"
+	done
+
 	ebegin "Starting dhcrelay"
 	start-stop-daemon --start --quiet --exec /usr/sbin/dhcrelay \
-		-- -q -i ${IFACE} ${DHCRELAY_OPTS} \
+		-- ${IFACES} ${DHCRELAY_OPTS} \
 		${DHCRELAY_SERVERS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dhcrelay"
-	start-stop-daemon --stop --quiet --pidfile /var/run/dhcp/dhcrelay.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/dhcrelay.pid
 	eend $?
 }