]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fstab-generator: skip fsck for /usr on non-device file systems
authorLennart Poettering <lennart@poettering.net>
Fri, 24 Jun 2016 19:07:18 +0000 (21:07 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 24 Jun 2016 19:07:18 +0000 (21:07 +0200)
We do the same already for the root device, hence follow the scheme for /usr
too.

(Also add some explanatory comments.)

src/fstab-generator/fstab-generator.c

index 8688ae51c99d184a94fa376ee935d5f5334d5d20..f941643c7042e13e3d2840d300985a215c2bc306 100644 (file)
@@ -532,10 +532,10 @@ static int add_sysroot_mount(void) {
                          "/sysroot",
                          arg_root_fstype,
                          opts,
-                         is_device_path(what) ? 1 : 0,
-                         false,
-                         false,
-                         false,
+                         is_device_path(what) ? 1 : 0, /* passno */
+                         false,                        /* noauto off */
+                         false,                        /* nofail off */
+                         false,                        /* automount off */
                          SPECIAL_INITRD_ROOT_FS_TARGET,
                          "/proc/cmdline");
 }
@@ -585,10 +585,10 @@ static int add_sysroot_usr_mount(void) {
                          "/sysroot/usr",
                          arg_usr_fstype,
                          opts,
-                         1,
-                         false,
-                         false,
-                         false,
+                         is_device_path(what) ? 1 : 0, /* passno */
+                         false,                        /* noauto off */
+                         false,                        /* nofail off */
+                         false,                        /* automount off */
                          SPECIAL_INITRD_FS_TARGET,
                          "/proc/cmdline");
 }