Merge pull request #2341 from nmartensen/fstab-generator-fixes

Fstab-generator fixes
2016-01-21 11:39:31 +01:00
parent 91c4b6db78 104bc12fbc
commit 5c9ddf7ff4
1 changed files with 1 additions and 3 deletions
@@ -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");
 }