Drop use of IFACE for dhcrelay6 #415957#5 by Spooky Ghost.

(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)

3 files changed, 14 insertions, 11 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index 5175477b72b1..f255a5201eba 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.208 2012/05/16 05:08:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.209 2012/05/16 15:57:20 vapier Exp $
+
+  16 May 2012; Mike Frysinger <vapier@gentoo.org> files/dhcrelay.init3,
+  files/dhcrelay6.conf:
+  Drop use of IFACE for dhcrelay6 #415957#5 by Spooky Ghost.
 
 *dhcp-4.2.3_p2 (16 May 2012)
 
diff --git a/net-misc/dhcp/files/dhcrelay.init3 b/net-misc/dhcp/files/dhcrelay.init3
index 277a844708f2..89e752541e9c 100755
--- a/net-misc/dhcp/files/dhcrelay.init3
+++ b/net-misc/dhcp/files/dhcrelay.init3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.1 2012/05/16 05:08:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.2 2012/05/16 15:57:20 vapier Exp $
 
 depend() {
 	need net
@@ -9,16 +9,21 @@ depend() {
 }
 
 start() {
-	if [ -z "${DHCRELAY_SERVERS}" ]; then
+	if [ -z "${DHCRELAY_SERVERS}" ] ; then
 		eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/${SVCNAME}"
 		return 1
 	fi
 
 	checkpath -d /var/run/dhcp
 
+	local iface_opts
+	if [ -n "${IFACE}" ] ; then
+		iface_opts=$(printf -- '-i %s ' ${IFACE})
+	fi
+
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --exec /usr/sbin/dhcrelay \
-		-- -q $(printf -- '-i %s ' ${IFACE}) ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
+		-- -q ${iface_opts} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
 	eend $?
 }
 
diff --git a/net-misc/dhcp/files/dhcrelay6.conf b/net-misc/dhcp/files/dhcrelay6.conf
index 19353e8b57ed..4e8b8c6fea39 100644
--- a/net-misc/dhcp/files/dhcrelay6.conf
+++ b/net-misc/dhcp/files/dhcrelay6.conf
@@ -1,10 +1,4 @@
-# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay
-
-# Configure which interface or interfaces to for dhcrelay to listen on
-# and send to.
-# List all interfaces space separated. If this is not specified then
-# we use all interfaces.
-#IFACE=""
+# /etc/conf.d/dhcrelay6: config file for /etc/init.d/dhcrelay6
 
 # Insert any other options needed.  See dhcrelay(8) for details.
 # Make sure you specify the lower (-l)/upper (-u) interfaces.