chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: rearrange log function naming
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index cd7dd3ca0f59ca67db4f9c527b6909bfbb174ab7..fdb80368d4dddfce19cfcd5cbd6068e3b9770418 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-52,17
+52,17
@@
int main(int argc, char *argv[]) {
/* Always create the directories people can create inotify
* watches in. */
/* 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)
log_error("Could not create runtime directory: %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory: %s",
strerror(-r));
- 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)
log_error("Could not create runtime directory 'links': %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory 'links': %s",
strerror(-r));
- r = mkdir_safe_label("/run/systemd/net
work
/leases", 0755, uid, gid);
+ r = mkdir_safe_label("/run/systemd/net
if
/leases", 0755, uid, gid);
if (r < 0)
log_error("Could not create runtime directory 'leases': %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory 'leases': %s",
strerror(-r));
@@
-71,11
+71,12
@@
int main(int argc, char *argv[]) {
(1ULL << CAP_NET_ADMIN) |
(1ULL << CAP_NET_BIND_SERVICE) |
(1ULL << CAP_NET_BROADCAST) |
(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) {
log_error("Could not create manager: %s", strerror(-r));
r = manager_new(&m);
if (r < 0) {
log_error("Could not create manager: %s", strerror(-r));
@@
-124,6
+125,7
@@
int main(int argc, char *argv[]) {
out:
sd_notify(false,
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;