chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: move the connection to the bus out of manager_new (again)
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index cd7dd3ca0f59ca67db4f9c527b6909bfbb174ab7..7319276c536890bc16a523063d1aff51f08d04b9 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-46,84
+46,85
@@
int main(int argc, char *argv[]) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
r = get_user_creds(&user, &uid, &gid, NULL, NULL);
if (r < 0) {
- log_error
("Cannot resolve user name %s: %s", user, strerror(-r)
);
+ log_error
_errno(r, "Cannot resolve user name %s: %m", user
);
goto out;
}
/* Always create the directories people can create inotify
* watches in. */
goto out;
}
/* Always create the directories people can create inotify
* watches in. */
- r = mkdir_safe_label("/run/systemd/net
work
", 0755, uid, gid);
+ r = mkdir_safe_label("/run/systemd/net
if
", 0755, uid, gid);
if (r < 0)
if (r < 0)
- log_error("Could not create runtime directory: %s",
- strerror(-r));
+ log_error_errno(r, "Could not create runtime directory: %m");
- r = mkdir_safe_label("/run/systemd/net
work
/links", 0755, uid, gid);
+ r = mkdir_safe_label("/run/systemd/net
if
/links", 0755, uid, gid);
if (r < 0)
if (r < 0)
- log_error("Could not create runtime directory 'links': %s",
- strerror(-r));
+ log_error_errno(r, "Could not create runtime directory 'links': %m");
+
+ r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
+ if (r < 0)
+ log_error_errno(r, "Could not create runtime directory 'leases': %m");
- r = mkdir_safe_label("/run/systemd/net
work/leases
", 0755, uid, gid);
+ r = mkdir_safe_label("/run/systemd/net
if/lldp
", 0755, uid, gid);
if (r < 0)
if (r < 0)
- log_error("Could not create runtime directory 'l
eases
': %s",
+ log_error("Could not create runtime directory 'l
ldp
': %s",
strerror(-r));
strerror(-r));
+
r = drop_privileges(uid, gid,
(1ULL << CAP_NET_ADMIN) |
(1ULL << CAP_NET_BIND_SERVICE) |
(1ULL << CAP_NET_BROADCAST) |
r = drop_privileges(uid, gid,
(1ULL << CAP_NET_ADMIN) |
(1ULL << CAP_NET_BIND_SERVICE) |
(1ULL << CAP_NET_BROADCAST) |
- (1ULL << CAP_NET_RAW) |
- (1ULL << CAP_SYS_MODULE));
+ (1ULL << CAP_NET_RAW));
if (r < 0)
goto out;
if (r < 0)
goto out;
+ assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
+
r = manager_new(&m);
if (r < 0) {
r = manager_new(&m);
if (r < 0) {
- log_error
("Could not create manager: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not create manager: %m"
);
goto out;
}
goto out;
}
- r = manager_
udev_listen
(m);
+ r = manager_
connect_bus
(m);
if (r < 0) {
if (r < 0) {
- log_error
("Could not connect to udev: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not connect to bus: %m"
);
goto out;
}
goto out;
}
- r = manager_
rtnl_listen
(m);
+ r = manager_
load_config
(m);
if (r < 0) {
if (r < 0) {
- log_error
("Could not connect to rtnl: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not load configuration files: %m"
);
goto out;
}
goto out;
}
- r = manager_
bus_listen
(m);
+ r = manager_
rtnl_enumerate_links
(m);
if (r < 0) {
if (r < 0) {
- log_error
("Could not connect to system bus: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not enumerate links: %m"
);
goto out;
}
goto out;
}
- r = manager_
load_config
(m);
+ r = manager_
rtnl_enumerate_addresses
(m);
if (r < 0) {
if (r < 0) {
- log_error
("Could not load configuration files: %s", strerror(-r)
);
+ log_error
_errno(r, "Could not enumerate links: %m"
);
goto out;
}
goto out;
}
- r = manager_rtnl_enumerate_links(m);
- if (r < 0) {
- log_error("Could not enumerate links: %s", strerror(-r));
- goto out;
- }
+ log_info("Enumeration completed");
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");
- r =
sd_event_loop(m->event
);
+ r =
manager_run(m
);
if (r < 0) {
if (r < 0) {
- log_error
("Event loop failed: %s", strerror(-r)
);
+ log_error
_errno(r, "Event loop failed: %m"
);
goto out;
}
out:
sd_notify(false,
goto out;
}
out:
sd_notify(false,
+ "STOPPING=1\n"
"STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
"STATUS=Shutting down...");
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;