summaryrefslogtreecommitdiff
path: root/src/fstab-generator
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-06-07 10:23:20 +0200
committerDaniel Mack <github@zonque.org>2016-06-07 10:23:20 +0200
commit138f4c69064504bf7ef83cc8a53133f007ad84d6 (patch)
tree0a958bed1ec2259900d84fc635b0346f73f4e946 /src/fstab-generator
parent646b997c118e261c5ececc434dd40d0dbdbac4d8 (diff)
fstab-generator: don't process root= if it happens to be "gpt-auto" (#3452)
As that's handled by "gpt-auto-generator". Fixes: #3404
Diffstat (limited to 'src/fstab-generator')
-rw-r--r--src/fstab-generator/fstab-generator.c6
1 files changed, 6 insertions, 0 deletions
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();