chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp-client/networkd: add interface MTU support
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index 769783000b1f4fb877606901e458f097f2a7fa80..055200cb005560d8a08997c187fd3bf916ae41ae 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-20,11
+20,12
@@
***/
#include "sd-event.h"
***/
#include "sd-event.h"
+#include "sd-daemon.h"
#include "networkd.h"
int main(int argc, char *argv[]) {
#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);
int r;
log_set_target(LOG_TARGET_AUTO);
@@
-35,28
+36,48
@@
int main(int argc, char *argv[]) {
if (argc != 1) {
log_error("This program takes no arguments.");
if (argc != 1) {
log_error("This program takes no arguments.");
- return EXIT_FAILURE;
+ r = -EINVAL;
+ goto out;
}
r = manager_new(&m);
}
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)
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)
r = manager_udev_enumerate_links(m);
if (r < 0)
-
return EXIT_FAILURE
;
+
goto out
;
r = manager_rtnl_listen(m);
if (r < 0)
r = manager_rtnl_listen(m);
if (r < 0)
- return EXIT_FAILURE;
+ goto out;
+
+
+ /* write out empty resolv.conf to avoid a
+ * dangling symlink */
+ r = manager_update_resolv_conf(m);
+ if (r < 0)
+ goto out;
+
+ sd_notify(false,
+ "READY=1\n"
+ "STATUS=Processing requests...");
r = sd_event_loop(m->event);
if (r < 0)
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;
}
}