From 138f4c69064504bf7ef83cc8a53133f007ad84d6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 7 Jun 2016 10:23:20 +0200
Subject: fstab-generator: don't process root= if it happens to be "gpt-auto"
 (#3452)

As that's handled by "gpt-auto-generator".

Fixes: #3404
---
 src/fstab-generator/fstab-generator.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/fstab-generator')

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 108522873e..fc7cf39847 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -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();
-- 
cgit v1.2.3