summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2016-06-23 17:47:03 +0100
committerLennart Poettering <lennart@poettering.net>2016-06-23 18:47:03 +0200
commit3ade16c9c842bb18a5c0edb56ed8153c250ddeaf (patch)
tree9241b1d1c7b0f862dcee33d8ecf355750f4ad70d
parent48a97bb4dc82e8994b8416c6b9f95fb59c495015 (diff)
fstab-generator: ignore root=/dev/nfs (#3591)
root=/dev/nfs is a legacy option for the kernel to handle root on NFS. Documentation for this kernel command line option can be found in the kernel source tree: Documentation/filesystems/nfs/nfsroot.txt
-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 fc7cf39847..880dc1bd2a 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -502,6 +502,12 @@ static int add_sysroot_mount(void) {
return 0;
}
+ if (streq(arg_root_what, "/dev/nfs")) {
+ /* This is handled by the kernel or the initrd */
+ log_debug("Skipping root directory handling, as /dev/nfs was requested.");
+ return 0;
+ }
+
what = fstab_node_to_udev_node(arg_root_what);
if (!what)
return log_oom();