root/trunk/freewrt/package/busybox/patches/960-ifupdown-env.patch

old/networking/ifupdown.c

@@ -919 +919 @@
-{
-        char **environend;
-        int i;
-
+
+
+
+
+
+
-        char **ppch;
+        char *ifupdown_env;
+        char t_var_name[16];
-
-        if (my_environ != NULL) {
-                for (ppch = my_environ; *ppch; ppch++) {
@@ -933 +940 @@
-        environend = my_environ;
-
-        for (i = 0; i < iface->n_options; i++) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                        continue;
-                }
-
+
+
+
-        }
+        
+        ifupdown_env = getenv("IFUPDOWN_ENV");
+        if (ifupdown_env == NULL)
+                ifupdown_env = "";
-
-        *(environend++) = setlocalenv("%s=%s", "IFACE", iface->iface);
-        *(environend++) = setlocalenv("%s=%s", "ADDRFAM", iface->address_family->name);
-        *(environend++) = setlocalenv("%s=%s", "METHOD", iface->method->name);
-        *(environend++) = setlocalenv("%s=%s", "MODE", mode);
-        *(environend++) = setlocalenv("%s=%s", "PATH", startup_PATH);
+        *(environend++) = setlocalenv("%s=%s", "IFUPDOWN_ENV", ifupdown_env);
-}
-
-static int doit(char *str)
@@ -1001 +1021 @@
-{
-        if (!iface->method->up(iface, check)) return -1;
-        set_environ(iface, "start");
+        remove("/tmp/ifupdown/env");    /* cleanup */
-        if (!execute_all(iface, "pre-up")) return 0;
-        if (!iface->method->up(iface, doit)) return 0;
-        if (!execute_all(iface, "up")) return 0;
@@ -1011 +1032 @@
-{
-        if (!iface->method->down(iface,check)) return -1;
-        set_environ(iface, "stop");
+        remove("/tmp/ifupdown/env");    /* cleanup */
-        if (!execute_all(iface, "down")) return 0;
-        if (!iface->method->down(iface, doit)) return 0;
-        if (!execute_all(iface, "post-down")) return 0;