delay bringup of interfaces until after the config reload

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 7bf8f25..eb2f754 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -184,6 +184,7 @@ interface_claim_device(struct interface *iface)
 static void
 interface_cleanup(struct interface *iface)
 {
+       interface_clear_errors(iface);
        if (iface->main_dev.dev)
                device_remove_user(&iface->main_dev);
        interface_set_proto_state(iface, NULL);
@@ -206,7 +207,7 @@ interface_do_reload(struct interface *iface)
        interface_claim_device(iface);
        proto_init_interface(iface, iface->config);
 
-       if (iface->autostart)
+       if (iface->autostart && !config_init)
                interface_set_up(iface);
 }
 
@@ -400,6 +401,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 {
        struct blob_attr *old_config = if_old->config;
 
+       interface_clear_errors(if_old);
        if_old->config = if_new->config;
        if (!if_old->config_autostart && if_new->config_autostart)
                if_old->autostart = true;