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: generalise ip header generation
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index 055200cb005560d8a08997c187fd3bf916ae41ae..a80740bbea00497b7e4e2bf5a27b9ef7a07a2a07 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-40,40
+40,64
@@
int main(int argc, char *argv[]) {
goto out;
}
goto out;
}
+ /* Always create the directories people can create inotify
+ * watches in. */
+ mkdir_label("/run/systemd/network/links", 0755);
+ mkdir_label("/run/systemd/network/leases", 0755);
+
r = manager_new(&m);
r = manager_new(&m);
- if (r < 0)
+ if (r < 0) {
+ log_error("Could not create manager: %s", strerror(-r));
goto out;
goto out;
+ }
r = manager_load_config(m);
r = manager_load_config(m);
- if (r < 0)
- return EXIT_FAILURE;
+ if (r < 0) {
+ log_error("Could not load configuration files: %s", strerror(-r));
+ goto out;
+ }
r = manager_udev_listen(m);
r = manager_udev_listen(m);
- if (r < 0)
+ if (r < 0) {
+ log_error("Could not connect to udev: %s", strerror(-r));
goto out;
goto out;
+ }
r = manager_udev_enumerate_links(m);
r = manager_udev_enumerate_links(m);
- if (r < 0)
+ if (r < 0) {
+ log_error("Could not enumerate links: %s", strerror(-r));
goto out;
goto out;
+ }
r = manager_rtnl_listen(m);
r = manager_rtnl_listen(m);
- if (r < 0)
+ if (r < 0) {
+ log_error("Could not connect to rtnl: %s", strerror(-r));
goto out;
goto out;
+ }
+ r = manager_bus_listen(m);
+ if (r < 0) {
+ log_error("Could not connect to system bus: %s", strerror(-r));
+ goto out;
+ }
/* write out empty resolv.conf to avoid a
* dangling symlink */
r = manager_update_resolv_conf(m);
/* write out empty resolv.conf to avoid a
* dangling symlink */
r = manager_update_resolv_conf(m);
- if (r < 0)
+ if (r < 0) {
+ log_error("Could not create resolv.conf: %s", strerror(-r));
goto out;
goto out;
+ }
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
r = sd_event_loop(m->event);
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
r = sd_event_loop(m->event);
- if (r < 0)
+ if (r < 0) {
+ log_error("Event loop failed: %s", strerror(-r));
goto out;
goto out;
+ }
out:
sd_notify(false,
out:
sd_notify(false,