X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=360afba986056e3ceab0eb765ff230c231197488;hb=7a7c74cae4db0c35cbe54d9bad8418a605cb870f;hp=ed93ffb3fc4dbf697c3c908aca42f16f3429e12a;hpb=f579559b3a14c1f1ef96c372e7626c4733e6ef7d;p=elogind.git diff --git a/src/network/networkd.c b/src/network/networkd.c index ed93ffb3f..360afba98 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -20,11 +20,12 @@ ***/ #include "sd-event.h" +#include "sd-daemon.h" #include "networkd.h" int main(int argc, char *argv[]) { - _cleanup_manager_free_ Manager *m; + _cleanup_manager_free_ Manager *m = NULL; int r; log_set_target(LOG_TARGET_AUTO); @@ -35,24 +36,41 @@ int main(int argc, char *argv[]) { if (argc != 1) { log_error("This program takes no arguments."); - return EXIT_FAILURE; + r = -EINVAL; + goto out; } r = manager_new(&m); + if (r < 0) + goto out; + + r = manager_load_config(m); if (r < 0) return EXIT_FAILURE; r = manager_udev_listen(m); if (r < 0) - return EXIT_FAILURE; + goto out; r = manager_udev_enumerate_links(m); if (r < 0) - return EXIT_FAILURE; + goto out; + + r = manager_rtnl_listen(m); + if (r < 0) + goto out; + + sd_notify(false, + "READY=1\n" + "STATUS=Processing requests..."); r = sd_event_loop(m->event); if (r < 0) - return EXIT_FAILURE; + goto out; + +out: + sd_notify(false, + "STATUS=Shutting down..."); - return EXIT_SUCCESS; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }