diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-05-15 11:13:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-15 11:13:45 +0200 |
| commit | e1e214c56bf7b369d4924a61db9268ed24e3c973 (patch) | |
| tree | 016fbc26769ea136b8132e4293742217d1676a90 /src/fstab-generator | |
| parent | Merge pull request #15052 from jaankit/journal-send (diff) | |
| parent | mount: introduce mount_is_nofail() helper (diff) | |
| download | systemd-e1e214c56bf7b369d4924a61db9268ed24e3c973.tar.xz systemd-e1e214c56bf7b369d4924a61db9268ed24e3c973.zip | |
Merge pull request #15265 from fbuihuu/mount-fixes
Mount fixes
Diffstat (limited to 'src/fstab-generator')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index bef2f27d3a..2b3e9ec7cb 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -391,12 +391,6 @@ static int add_mount( "SourcePath=%s\n", source); - /* All mounts under /sysroot need to happen later, at initrd-fs.target time. IOW, it's not - * technically part of the basic initrd filesystem itself, and so shouldn't inherit the default - * Before=local-fs.target dependency. */ - if (in_initrd() && path_startswith(where, "/sysroot")) - fprintf(f, "DefaultDependencies=no\n"); - if (STRPTR_IN_SET(fstype, "nfs", "nfs4") && !(flags & AUTOMOUNT) && fstab_test_yes_no_option(opts, "bg\0" "fg\0")) { /* The default retry timeout that mount.nfs uses for 'bg' mounts @@ -411,9 +405,6 @@ static int add_mount( SET_FLAG(flags, NOFAIL, true); } - if (!(flags & NOFAIL) && !(flags & AUTOMOUNT)) - fprintf(f, "Before=%s\n", post); - if (!(flags & AUTOMOUNT) && opts) { r = write_after(f, opts); if (r < 0) @@ -535,8 +526,6 @@ static int add_mount( "Documentation=man:fstab(5) man:systemd-fstab-generator(8)\n", source); - fprintf(f, "Before=%s\n", post); - if (opts) { r = write_after(f, opts); if (r < 0) |