From: Roy Marples <roy@marples.name>
Date: Mon, 20 Apr 2009 10:02:17 +0000 (+0000)
Subject: Revert iforder -> interface_order
X-Git-Tag: v5.0.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1b631bf9332b0169d8a6a4d781ac8e2ba114be3;p=thirdparty%2Fdhcpcd.git

Revert iforder -> interface_order
---

diff --git a/configure.c b/configure.c
index 48385a2f..d87a58f3 100644
--- a/configure.c
+++ b/configure.c
@@ -187,11 +187,11 @@ make_env(const struct interface *iface, char ***argv)
 	snprintf(env[4], e, "ifwireless=%d", iface->wireless);
 	env[5] = xmalloc(e);
 	snprintf(env[5], e, "ifflags=%u", iface->flags);
-	l = e = strlen("iforder=");
+	l = e = strlen("interface_order=");
 	for (ifp = ifaces; ifp; ifp = ifp->next)
 		e += strlen(ifp->name) + 1;
 	p = env[6] = xmalloc(e);
-	strlcpy(p, "iforder=", e);
+	strlcpy(p, "interface_order=", e);
 	e -= l;
 	p += l;
 	for (ifp = ifaces; ifp; ifp = ifp->next) {
diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
index 35ce93fb..ef0b0b70 100644
--- a/dhcpcd-run-hooks.in
+++ b/dhcpcd-run-hooks.in
@@ -29,12 +29,12 @@ uniqify()
 list_interfaces()
 {
 	local i= x= ifaces=
-	for i in $iforder; do
+	for i in $interface_order; do
 		[ -e "$1/$i" ] && ifaces="$ifaces${ifaces:+ }$i"
 	done
 	for x in "$1"/*; do
 		[ -e "$x" ] || continue
-		for i in $iforder; do
+		for i in $interface_order; do
 			if [ $i = "${x##*/}" ]; then
 				unset x
 				break