nspawn: properly handle image/directory paths that are symlinks

This resolves any paths specified on --directory=, --template=, and --image=
before using them. This makes sure nspawn can be used correctly on symlinked
images and directory trees.

Fixes: #2001

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 77b6be95e24f185c4ddb1da235d3c25dc51455f4..7749a460ebaf2f49c7e7fe72fcf38d4ffdf568e0 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2656,6 +2656,25 @@ static int determine_names(void) {
         return 0;
 }
 
+static int chase_symlinks_and_update(char **p) {
+        char *chased;
+        int r;
+
+        assert(p);
+
+        if (!*p)
+                return 0;
+
+        r = chase_symlinks(*p, NULL, &chased);
+        if (r < 0)
+                return log_error_errno(r, "Failed to resolve path %s: %m", *p);
+
+        free(*p);
+        *p = chased;
+
+        return 0;
+}
+
 static int determine_uid_shift(const char *directory) {
         int r;
 
@@ -4126,6 +4145,10 @@ int main(int argc, char *argv[]) {
                 if (arg_ephemeral) {
                         _cleanup_free_ char *np = NULL;
 
+                        r = chase_symlinks_and_update(&arg_directory);
+                        if (r < 0)
+                                goto finish;
+
                         /* If the specified path is a mount point we
                          * generate the new snapshot immediately
                          * inside it under a random name. However if
@@ -4181,6 +4204,10 @@ int main(int argc, char *argv[]) {
                         }
 
                         if (arg_template) {
+                                r = chase_symlinks_and_update(&arg_template);
+                                if (r < 0)
+                                        goto finish;
+
                                 r = btrfs_subvol_snapshot(arg_template, arg_directory,
                                                           (arg_read_only ? BTRFS_SNAPSHOT_READ_ONLY : 0) |
                                                           BTRFS_SNAPSHOT_FALLBACK_COPY |
@@ -4199,6 +4226,10 @@ int main(int argc, char *argv[]) {
                                                 log_info("Populated %s from template %s.", arg_directory, arg_template);
                                 }
                         }
+
+                        r = chase_symlinks_and_update(&arg_directory);
+                        if (r < 0)
+                                goto finish;
                 }
 
                 if (arg_start_mode == START_BOOT) {
@@ -4222,6 +4253,10 @@ int main(int argc, char *argv[]) {
                 assert(arg_image);
                 assert(!arg_template);
 
+                r = chase_symlinks_and_update(&arg_image);
+                if (r < 0)
+                        goto finish;
+
                 if (arg_ephemeral)  {
                         _cleanup_free_ char *np = NULL;