chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: make sure we can use IN_SET() also with complex function calls as first argument
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index 00e9a5f3da6dbc42ed60687eb6206733bc94c61b..2f6a12dbccfddb58f5068a63ff1fb7b1c86141bb 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-40,39
+40,44
@@
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);
if (r < 0) {
log_error("Could not create manager: %s", strerror(-r));
goto out;
}
r = manager_new(&m);
if (r < 0) {
log_error("Could not create manager: %s", strerror(-r));
goto out;
}
- r = manager_
load_config
(m);
+ r = manager_
udev_listen
(m);
if (r < 0) {
if (r < 0) {
- log_error("Could not
load configuration files
: %s", strerror(-r));
+ log_error("Could not
connect to udev
: %s", strerror(-r));
goto out;
}
goto out;
}
- r = manager_
udev
_listen(m);
+ r = manager_
rtnl
_listen(m);
if (r < 0) {
if (r < 0) {
- log_error("Could not connect to
udev
: %s", strerror(-r));
+ log_error("Could not connect to
rtnl
: %s", strerror(-r));
goto out;
}
goto out;
}
- r = manager_
udev_enumerate_links
(m);
+ r = manager_
bus_listen
(m);
if (r < 0) {
if (r < 0) {
- log_error("Could not
enumerate link
s: %s", strerror(-r));
+ log_error("Could not
connect to system bu
s: %s", strerror(-r));
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("Could not
load configuration files
: %s", strerror(-r));
goto out;
}
goto out;
}
- r = manager_
bus_listen
(m);
+ r = manager_
udev_enumerate_links
(m);
if (r < 0) {
if (r < 0) {
- log_error("Could not
connect to system bu
s: %s", strerror(-r));
+ log_error("Could not
enumerate link
s: %s", strerror(-r));
goto out;
}
goto out;
}