diff options
| author | nmartensen <nis.martensen@web.de> | 2016-01-15 07:55:25 +0100 |
|---|---|---|
| committer | nmartensen <nis.martensen@web.de> | 2016-01-15 07:55:25 +0100 |
| commit | ce3f6d82b003f365f718f24e48f55b8a0372b924 (patch) | |
| tree | ab88fdd1beb0ae666b3f9a84e6bd0c2398df197c /src/fstab-generator | |
| parent | Merge pull request #2322 from fbuihuu/downgrade-warn-for-not-found-unit (diff) | |
| download | systemd-ce3f6d82b003f365f718f24e48f55b8a0372b924.tar.xz systemd-ce3f6d82b003f365f718f24e48f55b8a0372b924.zip | |
fstab-generator: remove bogus condition
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.
Diffstat (limited to 'src/fstab-generator')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index 87b8b77f22..c924b655b6 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -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 |