nspawn: use automatic cleanup and provide debug info

The documentation for --link-journal is also reworded.

3 files changed, 71 insertions, 88 deletions

diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 1688687948..71ce0aca43 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -248,31 +248,30 @@
                                 <literal>host</literal>,
                                 <literal>guest</literal>,
                                 <literal>auto</literal>. If
-                                <literal>no</literal> the journal is
-                                not linked. If <literal>host</literal>
+                                <literal>no</literal>, the journal is
+                                not linked. If <literal>host</literal>,
                                 the journal files are stored on the
-                                host file system (beneath the host's
-                                <filename>/var/log/journal</filename>)
-                                and a per-machine subdirectory of this
-                                directory is created and bind mounted
+                                host file system (beneath
+                                <filename>/var/log/journal/&lt;machine-id&gt;</filename>)
+                                and the subdirectory is bind-mounted
                                 into the container at the same
-                                location. If <literal>guest</literal>
+                                location. If <literal>guest</literal>,
                                 the journal files are stored on the
-                                guest file system (beneath the guest's
-                                <filename>/var/log/journal</filename>)
-                                and a per-machine subdirectory of this
-                                directory is symlinked into the host
+                                guest file system (beneath
+                                <filename>/var/log/journal/&lt;machine-id&gt;</filename>)
+                                and the subdirectory is symlinked into the host
                                 at the same location. If
-                                <literal>auto</literal> (the default)
-                                and the subdirectory of
+                                <literal>auto</literal> (the default),
+                                and the right subdirectory of
                                 <filename>/var/log/journal</filename>
-                                exists as directory it is bind mounted
-                                into the container, but nothing is
-                                done otherwise. Effectively, booting a
-                                container once with
+                                exists, it will be bind mounted
+                                into the container. If the
+                                subdirectory doesn't exist, no
+                                linking is performed. Effectively,
+                                booting a container once with
                                 <literal>guest</literal> or
                                 <literal>host</literal> will link the
-                                journal persistently if further one
+                                journal persistently if further on
                                 the default of <literal>auto</literal>
                                 is used.</para></listitem>
                         </varlistentry>
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 5cac32cd8c..244ebb8342 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -668,58 +668,58 @@ static int setup_hostname(void) {
 
 static int setup_journal(const char *directory) {
         sd_id128_t machine_id;
-        char *p = NULL, *b = NULL, *l, *q = NULL, *d = NULL;
+        char _cleanup_free_ *p = NULL, *b = NULL, *q = NULL, *d = NULL;
+        char *id;
         int r;
 
         if (arg_link_journal == LINK_NO)
                 return 0;
 
         p = strappend(directory, "/etc/machine-id");
-        if (!p) {
-                r = log_oom();
-                goto finish;
-        }
+        if (!p)
+                return log_oom();
 
         r = read_one_line_file(p, &b);
-        if (r == -ENOENT && arg_link_journal == LINK_AUTO) {
-                r = 0;
-                goto finish;
-        } else if (r < 0) {
-                log_error("Failed to read machine ID: %s", strerror(-r));
+        if (r == -ENOENT && arg_link_journal == LINK_AUTO)
+                return 0;
+        else if (r < 0) {
+                log_error("Failed to read machine ID from %s: %s", p, strerror(-r));
                 return r;
         }
 
-        l = strstrip(b);
-        if (isempty(l) && arg_link_journal == LINK_AUTO) {
-                r = 0;
-                goto finish;
-        }
+        id = strstrip(b);
+        if (isempty(id) && arg_link_journal == LINK_AUTO)
+                return 0;
 
-        /* Verify validaty */
-        r = sd_id128_from_string(l, &machine_id);
+        /* Verify validity */
+        r = sd_id128_from_string(id, &machine_id);
         if (r < 0) {
-                log_error("Failed to parse machine ID: %s", strerror(-r));
-                goto finish;
+                log_error("Failed to parse machine ID from %s: %s", p, strerror(-r));
+                return r;
         }
 
         free(p);
-        p = strappend("/var/log/journal/", l);
-        q = strjoin(directory, "/var/log/journal/", l, NULL);
-        if (!p || !q) {
-                r = log_oom();
-                goto finish;
+        p = strappend("/var/log/journal/", id);
+        q = strjoin(directory, "/var/log/journal/", id, NULL);
+        if (!p || !q)
+                return log_oom();
+
+        if (path_is_mount_point(p, false) > 0) {
+                if (arg_link_journal != LINK_AUTO) {
+                        log_error("%s: already a mount point, refusing to use for journal", p);
+                        return -EEXIST;
+                }
+
+                return 0;
         }
 
-        if (path_is_mount_point(p, false) > 0 ||
-            path_is_mount_point(q, false) > 0) {
+        if (path_is_mount_point(q, false) > 0) {
                 if (arg_link_journal != LINK_AUTO) {
-                        log_error("Journal already a mount point, refusing.");
-                        r = -EEXIST;
-                        goto finish;
+                        log_error("%s: already a mount point, refusing to use for journal", q);
+                        return -EEXIST;
                 }
 
-                r = 0;
-                goto finish;
+                return 0;
         }
 
         r = readlink_and_make_absolute(p, &d);
@@ -728,89 +728,74 @@ static int setup_journal(const char *directory) {
                      arg_link_journal == LINK_AUTO) &&
                     path_equal(d, q)) {
 
-                        mkdir_p(q, 0755);
-
-                        r = 0;
-                        goto finish;
+                        r = mkdir_p(q, 0755);
+                        if (r < 0)
+                                log_warning("failed to create directory %s: %m", q);
+                        return 0;
                 }
 
                 if (unlink(p) < 0) {
                         log_error("Failed to remove symlink %s: %m", p);
-                        r = -errno;
-                        goto finish;
+                        return -errno;
                 }
         } else if (r == -EINVAL) {
 
                 if (arg_link_journal == LINK_GUEST &&
                     rmdir(p) < 0) {
 
-                        if (errno == ENOTDIR)
-                                log_error("%s already exists and is neither symlink nor directory.", p);
-                        else {
+                        if (errno == ENOTDIR) {
+                                log_error("%s already exists and is neither a symlink nor a directory", p);
+                                return r;
+                        } else {
                                 log_error("Failed to remove %s: %m", p);
-                                r = -errno;
+                                return -errno;
                         }
-
-                        goto finish;
                 }
         } else if (r != -ENOENT) {
                 log_error("readlink(%s) failed: %m", p);
-                goto finish;
+                return r;
         }
 
         if (arg_link_journal == LINK_GUEST) {
 
                 if (symlink(q, p) < 0) {
                         log_error("Failed to symlink %s to %s: %m", q, p);
-                        r = -errno;
-                        goto finish;
+                        return -errno;
                 }
 
-                mkdir_p(q, 0755);
-
-                r = 0;
-                goto finish;
+                r = mkdir_p(q, 0755);
+                if (r < 0)
+                        log_warning("failed to create directory %s: %m", q);
+                return 0;
         }
 
         if (arg_link_journal == LINK_HOST) {
                 r = mkdir_p(p, 0755);
                 if (r < 0) {
                         log_error("Failed to create %s: %m", p);
-                        goto finish;
+                        return r;
                 }
 
-        } else if (access(p, F_OK) < 0) {
-                r = 0;
-                goto finish;
-        }
+        } else if (access(p, F_OK) < 0)
+                return 0;
 
         if (dir_is_empty(q) == 0) {
                 log_error("%s not empty.", q);
-                r = -ENOTEMPTY;
-                goto finish;
+                return -ENOTEMPTY;
         }
 
         r = mkdir_p(q, 0755);
         if (r < 0) {
                 log_error("Failed to create %s: %m", q);
-                goto finish;
+                return r;
         }
 
         if (mount(p, q, "bind", MS_BIND, NULL) < 0) {
                 log_error("Failed to bind mount journal from host into guest: %m");
-                r = -errno;
-                goto finish;
+                return -errno;
         }
 
-        r = 0;
-
-finish:
-        free(p);
-        free(q);
-        free(d);
-        free(b);
-        return r;
-
+        return 0;
 }
 
 static int drop_capabilities(void) {
diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c
index e8b92e8b21..d654b632eb 100644
--- a/src/shared/mkdir.c
+++ b/src/shared/mkdir.c
@@ -29,7 +29,6 @@
 #include "mkdir.h"
 #include "label.h"
 #include "util.h"
-#include "log.h"
 
 int mkdir_label(const char *path, mode_t mode) {
         return label_mkdir(path, mode, true);