Revert iforder -> interface_order

diff --git a/configure.c b/configure.c
index 48385a2f1d5b004b9c98cab41e931fc9008a8bac..d87a58f3fa65e27c2267309b224f7b8db0cd0331 100644 (file)
--- 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 35ce93fb151dce9f6a3a9af213cc0a70784a476f..ef0b0b7092f06bc327dca4ce1344dca7bb3aaed5 100644 (file)
--- 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