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: use LOG_WARN not LOG_ERR for non-fatal errors
[elogind.git]
/
src
/
network
/
networkd.c
diff --git
a/src/network/networkd.c
b/src/network/networkd.c
index 0aaef8b79232c9658dc1ce9704d588dd04a416ee..543a4e4d9593e923dc39ad80e6169841393447f8 100644
(file)
--- a/
src/network/networkd.c
+++ b/
src/network/networkd.c
@@
-20,7
+20,6
@@
***/
#include "capability.h"
***/
#include "capability.h"
-#include "sd-event.h"
#include "sd-daemon.h"
#include "networkd.h"
#include "sd-daemon.h"
#include "networkd.h"
@@
-54,21
+53,19
@@
int main(int argc, char *argv[]) {
* watches in. */
r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
if (r < 0)
* watches in. */
r = mkdir_safe_label("/run/systemd/netif", 0755, uid, gid);
if (r < 0)
- log_
error
_errno(r, "Could not create runtime directory: %m");
+ log_
warning
_errno(r, "Could not create runtime directory: %m");
r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
if (r < 0)
r = mkdir_safe_label("/run/systemd/netif/links", 0755, uid, gid);
if (r < 0)
- log_
error
_errno(r, "Could not create runtime directory 'links': %m");
+ log_
warning
_errno(r, "Could not create runtime directory 'links': %m");
r = mkdir_safe_label("/run/systemd/netif/leases", 0755, uid, gid);
if (r < 0)
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");
+ log_
warning
_errno(r, "Could not create runtime directory 'leases': %m");
r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
if (r < 0)
r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
if (r < 0)
- log_error("Could not create runtime directory 'lldp': %s",
- strerror(-r));
-
+ log_warning_errno(r, "Could not create runtime directory 'lldp': %m");
r = drop_privileges(uid, gid,
(1ULL << CAP_NET_ADMIN) |
r = drop_privileges(uid, gid,
(1ULL << CAP_NET_ADMIN) |
@@
-86,6
+83,12
@@
int main(int argc, char *argv[]) {
goto out;
}
goto out;
}
+ r = manager_connect_bus(m);
+ if (r < 0) {
+ log_error_errno(r, "Could not connect to bus: %m");
+ goto out;
+ }
+
r = manager_load_config(m);
if (r < 0) {
log_error_errno(r, "Could not load configuration files: %m");
r = manager_load_config(m);
if (r < 0) {
log_error_errno(r, "Could not load configuration files: %m");
@@
-110,7
+113,7
@@
int main(int argc, char *argv[]) {
"READY=1\n"
"STATUS=Processing requests...");
"READY=1\n"
"STATUS=Processing requests...");
- r =
sd_event_loop(m->event
);
+ r =
manager_run(m
);
if (r < 0) {
log_error_errno(r, "Event loop failed: %m");
goto out;
if (r < 0) {
log_error_errno(r, "Event loop failed: %m");
goto out;