summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-04-20 10:02:17 +0000
committerRoy Marples <roy@marples.name>2009-04-20 10:02:17 +0000
commitc1b631bf9332b0169d8a6a4d781ac8e2ba114be3 (patch)
tree9c5498cb4719ef1ee2fed93b59baa941c4d67d7f
parent4f06fdc0f91d4a1a5dcc16853bad22501bb3ce70 (diff)
downloaddhcpcd-c1b631bf9332b0169d8a6a4d781ac8e2ba114be3.tar.xz
Revert iforder -> interface_order
-rw-r--r--configure.c4
-rw-r--r--dhcpcd-run-hooks.in4
2 files changed, 4 insertions, 4 deletions
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