X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface-event.c;h=4e0773df45adb1966ec522f85d572c1f61e249ba;hp=46611432c7738387a6b3c6d5783dc77ff52e1a47;hb=e8f450ba2e67716cf3ed70060a309b80aa24cf00;hpb=23880ff5333c3ca1da1250e8821091f6ae62f566 diff --git a/interface-event.c b/interface-event.c index 4661143..4e0773d 100644 --- a/interface-event.c +++ b/interface-event.c @@ -20,7 +20,7 @@ static struct uloop_process task = { }; static void -run_cmd(const char *ifname, bool up) +run_cmd(const char *ifname, const char *device, bool up) { char *argv[3]; int pid; @@ -37,8 +37,10 @@ run_cmd(const char *ifname, bool up) setenv("ACTION", up ? "ifup" : "ifdown", 1); setenv("INTERFACE", ifname, 1); + if (device) + setenv("DEVICE", device, 1); argv[0] = hotplug_cmd_path; - argv[1] = "network"; + argv[1] = "iface"; argv[2] = NULL; execvp(argv[0], argv); exit(127); @@ -47,6 +49,7 @@ run_cmd(const char *ifname, bool up) static void call_hotplug(void) { + const char *device = NULL; if (list_empty(&pending)) return; @@ -54,8 +57,11 @@ call_hotplug(void) current_ev = current->hotplug_ev; list_del_init(¤t->hotplug_list); - D(SYSTEM, "Call hotplug handler for interface '%s'\n", current->name); - run_cmd(current->name, current_ev == IFEV_UP); + if (current_ev == IFEV_UP && current->l3_dev->dev) + device = current->l3_dev->dev->ifname; + + D(SYSTEM, "Call hotplug handler for interface '%s' (%s)\n", current->name, device ? device : "none"); + run_cmd(current->name, device, current_ev == IFEV_UP); } static void