From: Roy Marples <roy@marples.name>
Date: Tue, 10 Mar 2015 13:28:11 +0000 (+0000)
Subject: For DHCP, use a .dhcp suffix.
X-Git-Tag: v6.8.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fb8a23bb3a3c328cdc8f08110d6e28e98a44937;p=thirdparty%2Fdhcpcd.git

For DHCP, use a .dhcp suffix.
Change from using :dhcp6 and :ra to .dhcp6 and .ra to be more inline with Debian resolvconf.
---

diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index 8094920e..d48ffa27 100644
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -4,11 +4,11 @@
 # Handy variables and functions for our hooks to use
 case "$reason" in
 	ROUTERADVERT)
-		ifsuffix=":ra";;
+		ifsuffix=".ra";;
 	INFORM6|BOUND6|RENEW6|REBIND6|REBOOT6|EXPIRE6|RELEASE6|STOP6)
-		ifsuffix=":dhcp6";;
+		ifsuffix=".dhcp6";;
 	*)
-		ifsuffix=;;
+		ifsuffix=".dhcp";;
 esac
 ifname="$interface$ifsuffix${ifclass+.}$ifclass"
 
@@ -45,19 +45,14 @@ list_interfaces()
 {
 	local i= x= ifaces=
 	for i in $interface_order; do
-		[ -e "$1/$i" ] && ifaces="$ifaces${ifaces:+ }$i"
+		for x in "$1"/$i.*; do
+			[ -f "$x" ] && ifaces="$ifaces${ifaces:+ }${x##*/}"
+		done
 	done
 	for x in "$1"/*; do
-		[ -e "$x" ] || continue
-		for i in $interface_order; do
-			if [ $i = "${x##*/}" ]; then
-				x=
-				break
-			fi
-		done
-		[ -n "$x" ] && ifaces="$ifaces${ifaces:+ }${x##*/}"
+		[ -f "$x" ] && ifaces="$ifaces${ifaces:+ }${x##*/}"
 	done
-	echo "$ifaces"
+	uniqify $ifaces
 }
 
 # Trim function