resolved: emit full path to file we failed to write

Otherwise it's unclear if it's /etc/resolv.conf or some
other file that is meant.

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 4306403834955fc7b647738e3948b9336fab1eb0..fbd188c2acf23ae3be09e5d2847408b7d2c4f9e0 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -288,7 +288,7 @@ static int on_network_event(sd_event_source *s, int fd, uint32_t revents, void *
 
         r = manager_write_resolv_conf(m);
         if (r < 0)
-                log_warning_errno(r, "Could not update resolv.conf: %m");
+                log_warning_errno(r, "Could not update "PRIVATE_RESOLV_CONF": %m");
 
         return 0;
 }

diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 7567f4c369e3f478cfa59d1acc632f641f8531e4..c5ce9c4f01954dab05411a3cfe58934a991bb94a 100644 (file)
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -226,8 +226,6 @@ static int write_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSet *doma
 
 int manager_write_resolv_conf(Manager *m) {
 
-        #define PRIVATE_RESOLV_CONF "/run/systemd/resolve/resolv.conf"
-
         _cleanup_ordered_set_free_ OrderedSet *dns = NULL, *domains = NULL;
         _cleanup_free_ char *temp_path = NULL;
         _cleanup_fclose_ FILE *f = NULL;

diff --git a/src/resolve/resolved-resolv-conf.h b/src/resolve/resolved-resolv-conf.h
index a3355e994b5a86151dcb0a880be1082c3f98e7ef..708156396508f515ae098397488e64d0f0aa53c9 100644 (file)
--- a/src/resolve/resolved-resolv-conf.h
+++ b/src/resolve/resolved-resolv-conf.h
@@ -23,5 +23,7 @@
 
 #include "resolved-manager.h"
 
+#define PRIVATE_RESOLV_CONF "/run/systemd/resolve/resolv.conf"
+
 int manager_read_resolv_conf(Manager *m);
 int manager_write_resolv_conf(Manager *m);

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 472bb32764e4ebd660bfcac62424531127441323..eee52da882fa2ebbd8a35efe0b5e1cb5b2b8c034 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -91,7 +91,7 @@ int main(int argc, char *argv[]) {
          * symlink */
         r = manager_write_resolv_conf(m);
         if (r < 0)
-                log_warning_errno(r, "Could not create resolv.conf: %m");
+                log_warning_errno(r, "Could not create "PRIVATE_RESOLV_CONF": %m");
 
         sd_notify(false,
                   "READY=1\n"