From: Harald Hoyer <harald@redhat.com>
Date: Thu, 23 Jun 2016 16:47:03 +0000 (+0100)
Subject: fstab-generator: ignore root=/dev/nfs (#3591)
X-Git-Tag: v231~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ade16c9c842bb18a5c0edb56ed8153c250ddeaf;p=thirdparty%2Fsystemd.git

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
---

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index fc7cf39847e..880dc1bd2a4 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();