]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fstab-generator: remove bogus condition
authornmartensen <nis.martensen@web.de>
Fri, 15 Jan 2016 06:55:25 +0000 (07:55 +0100)
committernmartensen <nis.martensen@web.de>
Fri, 15 Jan 2016 06:55:25 +0000 (07:55 +0100)
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:

initrd-root-fs.target.requires
`-- usr.mount -> /run/systemd/generator/usr.mount

in the main system (i.e., not in the initramfs). In the initramfs, the previous condition already kicks in.

src/fstab-generator/fstab-generator.c

index 87b8b77f222f0432aa75da93e5194c78b51f103f..c924b655b641bb8aea7dc1271aa26c49a7a5ae21 100644 (file)
@@ -463,8 +463,6 @@ static int parse_fstab(bool initrd) {
                                                       "x-systemd.automount\0");
                         if (initrd)
                                 post = SPECIAL_INITRD_FS_TARGET;
-                        else if (mount_in_initrd(me))
-                                post = SPECIAL_INITRD_ROOT_FS_TARGET;
                         else if (mount_is_network(me))
                                 post = SPECIAL_REMOTE_FS_TARGET;
                         else