fstab-generator: don’t rely on /usr being mounted in the initrd

Debian is not there yet. Let’s revert this upstream change for now.

Closes: #724797

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index a5db5fde0802237d603184516f455688922320f7..ceab9e74509b06f36752fcc2e0340da3419e3827 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -194,9 +194,7 @@ static bool mount_is_network(struct mntent *me) {
 static bool mount_in_initrd(struct mntent *me) {
         assert(me);
 
-        return
-                hasmntopt(me, "x-initrd.mount") ||
-                streq(me->mnt_dir, "/usr");
+        return hasmntopt(me, "x-initrd.mount");
 }
 
 static int add_mount(