daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
a19bc6
From 38815fb30199a76684d4153a0a2dcd6abd3a2dda Mon Sep 17 00:00:00 2001
a19bc6
From: nmartensen <nis.martensen@web.de>
a19bc6
Date: Fri, 15 Jan 2016 07:55:25 +0100
a19bc6
Subject: [PATCH] fstab-generator: remove bogus condition
a19bc6
a19bc6
The sysroot mount is already taken care of by the add_sysroot_mount function. With this condition left in, we can get something like this:
a19bc6
a19bc6
initrd-root-fs.target.requires
a19bc6
`-- usr.mount -> /run/systemd/generator/usr.mount
a19bc6
a19bc6
in the main system (i.e., not in the initramfs). In the initramfs, the previous condition already kicks in.
a19bc6
Cherry-picked from: ce3f6d82b003f365f718f24e48f55b8a0372b924
a19bc6
Resolves: #1446171
a19bc6
---
a19bc6
 src/fstab-generator/fstab-generator.c | 2 --
a19bc6
 1 file changed, 2 deletions(-)
a19bc6
a19bc6
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
c62b8e
index 32aca22444..23b5457e43 100644
a19bc6
--- a/src/fstab-generator/fstab-generator.c
a19bc6
+++ b/src/fstab-generator/fstab-generator.c
a19bc6
@@ -476,8 +476,6 @@ static int parse_fstab(bool initrd) {
a19bc6
                                                       "x-systemd.automount\0");
a19bc6
                         if (initrd)
a19bc6
                                 post = SPECIAL_INITRD_FS_TARGET;
a19bc6
-                        else if (mount_in_initrd(me))
a19bc6
-                                post = SPECIAL_INITRD_ROOT_FS_TARGET;
a19bc6
                         else if (mount_is_network(me))
a19bc6
                                 post = SPECIAL_REMOTE_FS_TARGET;
a19bc6
                         else