]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fstab-generator: don't process root= if it happens to be "gpt-auto" (#3452)
authorLennart Poettering <lennart@poettering.net>
Tue, 7 Jun 2016 08:23:20 +0000 (10:23 +0200)
committerDaniel Mack <github@zonque.org>
Tue, 7 Jun 2016 08:23:20 +0000 (10:23 +0200)
As that's handled by "gpt-auto-generator".

Fixes: #3404
src/fstab-generator/fstab-generator.c

index 108522873e8730114bbb2dd3a23329d642058b72..fc7cf39847e003f687db95ea431a0c89e1e92e37 100644 (file)
@@ -496,6 +496,12 @@ static int add_sysroot_mount(void) {
                 return 0;
         }
 
+        if (streq(arg_root_what, "gpt-auto")) {
+                /* This is handled by the gpt-auto generator */
+                log_debug("Skipping root directory handling, as gpt-auto was requested.");
+                return 0;
+        }
+
         what = fstab_node_to_udev_node(arg_root_what);
         if (!what)
                 return log_oom();