From: Michael Stapelberg <stapelberg@debian.org>
Date: Tue, 29 Oct 2013 22:29:22 +0100
Subject: =?utf-8?q?fstab-generator=3A_don=E2=80=99t_rely_on_/usr_being_mou?=
 =?utf-8?q?nted_in_the_initrd?=
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

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

Closes: #724797
---
 src/fstab-generator/fstab-generator.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 1256a1c..21d30c8 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -160,9 +160,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(
