From 3ff220f1861f76ddfeb1aebc61ffbaf14b6d60df Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 19 Oct 2011 17:31:32 +0200 Subject: [PATCH] include the DEVICE variable in hotplug events --- interface-event.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/interface-event.c b/interface-event.c index 4661143..83ac6f7 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,6 +37,8 @@ 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[2] = NULL; @@ -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 -- 2.30.2