chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cryptsetup-generator: Add support for UUID-specific key files on kernel command line
[elogind.git]
/
src
/
network
/
networkd-manager.c
diff --git
a/src/network/networkd-manager.c
b/src/network/networkd-manager.c
index e2190b591e9e3a40f1e237ac3cb81f737ee7bb44..a708e905f430d3acf1a228088a53d59b3068d732 100644
(file)
--- a/
src/network/networkd-manager.c
+++ b/
src/network/networkd-manager.c
@@
-262,8
+262,7
@@
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, vo
/* link is new, so add it */
r = link_add(m, message, &link);
if (r < 0) {
/* link is new, so add it */
r = link_add(m, message, &link);
if (r < 0) {
- log_debug("could not add new link: %s",
- strerror(-r));
+ log_debug_errno(r, "could not add new link: %m");
return 0;
}
}
return 0;
}
}
@@
-356,10
+355,8
@@
int manager_udev_listen(Manager *m) {
assert(m->udev_monitor);
r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL);
assert(m->udev_monitor);
r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_monitor, "net", NULL);
- if (r < 0) {
- log_error_errno(-r, "Could not add udev monitor filter: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Could not add udev monitor filter: %m");
r = udev_monitor_enable_receiving(m->udev_monitor);
if (r < 0) {
r = udev_monitor_enable_receiving(m->udev_monitor);
if (r < 0) {
@@
-597,7
+594,7
@@
int manager_save(Manager *m) {
return 0;
fail:
return 0;
fail:
- log_error_errno(
-
r, "Failed to save network state to %s: %m", m->state_file);
+ log_error_errno(r, "Failed to save network state to %s: %m", m->state_file);
unlink(m->state_file);
unlink(temp_path);
return r;
unlink(m->state_file);
unlink(temp_path);
return r;