resolved: Support resolved.conf.d directories in the usual search paths

[elogind.git] / src / resolve / resolved.c

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 6dd4cade05e9346043afb9d087457bde30f2079b..c0ab947c0e88759fab91aeed87919bdcaba82dc3 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -49,20 +49,20 @@ int main(int argc, char *argv[]) {
 
         r = mac_selinux_init(NULL);
         if (r < 0) {
-                log_error("SELinux setup failed: %s", strerror(-r));
+                log_error_errno(r, "SELinux setup failed: %m");
                 goto finish;
         }
 
         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 finish;
         }
 
         /* Always create the directory where resolv.conf will live */
         r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid);
         if (r < 0) {
-                log_error("Could not create runtime directory: %s", strerror(-r));
+                log_error_errno(r, "Could not create runtime directory: %m");
                 goto finish;
         }
 
@@ -74,17 +74,17 @@ int main(int argc, char *argv[]) {
 
         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 finish;
         }
 
         r = manager_parse_config_file(m);
         if (r < 0)
-                log_warning("Failed to parse configuration file: %s", strerror(-r));
+                log_warning_errno(r, "Failed to parse configuration file: %m");
 
         r = manager_start(m);
         if (r < 0) {
-                log_error("Failed to start manager: %s", strerror(-r));
+                log_error_errno(r, "Failed to start manager: %m");
                 goto finish;
         }
 
@@ -92,7 +92,7 @@ int main(int argc, char *argv[]) {
          * symlink */
         r = manager_write_resolv_conf(m);
         if (r < 0)
-                log_warning("Could not create resolv.conf: %s", strerror(-r));
+                log_warning_errno(r, "Could not create resolv.conf: %m");
 
         sd_notify(false,
                   "READY=1\n"
@@ -100,7 +100,7 @@ int main(int argc, char *argv[]) {
 
         r = sd_event_loop(m->event);
         if (r < 0) {
-                log_error("Event loop failed: %s", strerror(-r));
+                log_error_errno(r, "Event loop failed: %m");
                 goto finish;
         }