summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2016-01-21 11:39:31 +0100
committerHarald Hoyer <harald@redhat.com>2016-01-21 11:39:31 +0100
commit5c9ddf7ff49a89639e0d7fe86022f5f125803f45 (patch)
tree0f4c97f7c74e38160ada820e77a0eb3182afec48
parent91c4b6db7840e68e4d7a019c3cb4d5d60d2a65c7 (diff)
parent104bc12fbc23c3ca852d9d389805c615cd590d01 (diff)
Merge pull request #2341 from nmartensen/fstab-generator-fixes
Fstab-generator fixes
-rw-r--r--src/fstab-generator/fstab-generator.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 87b8b77f22..1468dc8df6 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
@@ -576,7 +574,7 @@ static int add_sysroot_usr_mount(void) {
false,
false,
false,
- SPECIAL_INITRD_ROOT_FS_TARGET,
+ SPECIAL_INITRD_FS_TARGET,
"/proc/cmdline");
}