Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

11 files changed, 75 insertions, 20 deletions

diff --git a/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/foo.service.wants/mnt-wantedby-automount.automount b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/foo.service.wants/mnt-wantedby-automount.automount
new file mode 120000
index 0000000..14fd395
--- /dev/null
+++ b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/foo.service.wants/mnt-wantedby-automount.automount
@@ -0,0 +1 @@
+../mnt-wantedby-automount.automount
\ No newline at end of file
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-requiredby.mount b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-requiredby.mount
index 5edc4dd..96fd672 100644
--- a/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-requiredby.mount
+++ b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-requiredby.mount
@@ -3,7 +3,9 @@
 [Unit]
 Documentation=man:fstab(5) man:systemd-fstab-generator(8)
 SourcePath=/etc/fstab
-Before=local-fs.target
+DefaultDependencies=no
+Conflicts=umount.target
+Before=umount.target
 After=blockdev@dev-sdx8.target
 
 [Mount]
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.automount b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.automount
new file mode 100644
index 0000000..b9f2d28
--- /dev/null
+++ b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.automount
@@ -0,0 +1,8 @@
+# Automatically generated by systemd-fstab-generator
+
+[Unit]
+SourcePath=/etc/fstab
+Documentation=man:fstab(5) man:systemd-fstab-generator(8)
+
+[Automount]
+Where=/mnt/wantedby-automount
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.mount b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.mount
new file mode 100644
index 0000000..d909476
--- /dev/null
+++ b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.mount
@@ -0,0 +1,14 @@
+# Automatically generated by systemd-fstab-generator
+
+[Unit]
+Documentation=man:fstab(5) man:systemd-fstab-generator(8)
+SourcePath=/etc/fstab
+DefaultDependencies=no
+Conflicts=umount.target
+Before=umount.target
+After=blockdev@dev-sdx17.target
+
+[Mount]
+What=/dev/sdx17
+Where=/mnt/wantedby
+Options=x-systemd.wanted-by=foo.service,x-systemd.automount
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby.mount b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby.mount
index e12df82..ff76a6f 100644
--- a/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby.mount
+++ b/test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby.mount
@@ -3,7 +3,9 @@
 [Unit]
 Documentation=man:fstab(5) man:systemd-fstab-generator(8)
 SourcePath=/etc/fstab
-Before=local-fs.target
+DefaultDependencies=no
+Conflicts=umount.target
+Before=umount.target
 After=blockdev@dev-sdx7.target
 
 [Mount]
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby-automount.automount b/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby-automount.automount
new file mode 120000
index 0000000..14fd395
--- /dev/null
+++ b/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby-automount.automount
@@ -0,0 +1 @@
+../mnt-wantedby-automount.automount
\ No newline at end of file
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requiredby.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requiredby.mount
index 5edc4dd..96fd672 100644
--- a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requiredby.mount
+++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requiredby.mount
@@ -3,7 +3,9 @@
 [Unit]
 Documentation=man:fstab(5) man:systemd-fstab-generator(8)
 SourcePath=/etc/fstab
-Before=local-fs.target
+DefaultDependencies=no
+Conflicts=umount.target
+Before=umount.target
 After=blockdev@dev-sdx8.target
 
 [Mount]
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.automount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.automount
new file mode 100644
index 0000000..b9f2d28
--- /dev/null
+++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.automount
@@ -0,0 +1,8 @@
+# Automatically generated by systemd-fstab-generator
+
+[Unit]
+SourcePath=/etc/fstab
+Documentation=man:fstab(5) man:systemd-fstab-generator(8)
+
+[Automount]
+Where=/mnt/wantedby-automount
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.mount
new file mode 100644
index 0000000..d909476
--- /dev/null
+++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.mount
@@ -0,0 +1,14 @@
+# Automatically generated by systemd-fstab-generator
+
+[Unit]
+Documentation=man:fstab(5) man:systemd-fstab-generator(8)
+SourcePath=/etc/fstab
+DefaultDependencies=no
+Conflicts=umount.target
+Before=umount.target
+After=blockdev@dev-sdx17.target
+
+[Mount]
+What=/dev/sdx17
+Where=/mnt/wantedby
+Options=x-systemd.wanted-by=foo.service,x-systemd.automount
diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby.mount
index e12df82..ff76a6f 100644
--- a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby.mount
+++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby.mount
@@ -3,7 +3,9 @@
 [Unit]
 Documentation=man:fstab(5) man:systemd-fstab-generator(8)
 SourcePath=/etc/fstab
-Before=local-fs.target
+DefaultDependencies=no
+Conflicts=umount.target
+Before=umount.target
 After=blockdev@dev-sdx7.target
 
 [Mount]
diff --git a/test/test-fstab-generator/test-18-options.fstab.input b/test/test-fstab-generator/test-18-options.fstab.input
index 98ef0b9..2112d68 100644
--- a/test/test-fstab-generator/test-18-options.fstab.input
+++ b/test/test-fstab-generator/test-18-options.fstab.input
@@ -1,16 +1,17 @@
-/dev/sdx1  /sysroot        auto defaults                                       0 1
-/dev/sdx2  /mnt/timeout    auto x-systemd.mount-timeout=10m                    0 0
-/dev/sdx3  /mnt/after      auto x-systemd.after=foo.service                    0 0
-/dev/sdx4  /mnt/before     auto x-systemd.before=foo.service                   0 0
-/dev/sdx5  /mnt/requires   auto x-systemd.requires=foo.service                 0 0
-/dev/sdx6  /mnt/reqmounts  auto x-systemd.requires-mounts-for=/hoge            0 0
-/dev/sdx7  /mnt/wantedby   auto x-systemd.wanted-by=foo.service                0 0
-/dev/sdx8  /mnt/requiredby auto x-systemd.required-by=foo.service              0 0
-/dev/sdx9  /mnt/automount1 auto x-systemd.automount,x-systemd.idle-timeout=30m 0 0
-/dev/sdx10 /mnt/automount2 auto x-systemd.automount,nofail                     0 0
-/dev/sdx11 /mnt/rwonly     auto x-systemd.rw-only                              0 0
-/dev/sdx12 /mnt/mkfs       ext4 x-systemd.makefs                               0 0
-/dev/sdx13 /mnt/growfs     auto x-systemd.growfs                               0 0
-/dev/sdx14 /mnt/pcrfs      auto x-systemd.pcrfs                                0 0
-/dev/sdx15 /mnt/noauto     auto noauto                                         0 0
-/dev/sdx16 /mnt/nofail     auto nofail                                         0 0
+/dev/sdx1  /sysroot                auto defaults                                            0 1
+/dev/sdx2  /mnt/timeout            auto x-systemd.mount-timeout=10m                         0 0
+/dev/sdx3  /mnt/after              auto x-systemd.after=foo.service                         0 0
+/dev/sdx4  /mnt/before             auto x-systemd.before=foo.service                        0 0
+/dev/sdx5  /mnt/requires           auto x-systemd.requires=foo.service                      0 0
+/dev/sdx6  /mnt/reqmounts          auto x-systemd.requires-mounts-for=/hoge                 0 0
+/dev/sdx7  /mnt/wantedby           auto x-systemd.wanted-by=foo.service                     0 0
+/dev/sdx8  /mnt/requiredby         auto x-systemd.required-by=foo.service                   0 0
+/dev/sdx9  /mnt/automount1         auto x-systemd.automount,x-systemd.idle-timeout=30m      0 0
+/dev/sdx10 /mnt/automount2         auto x-systemd.automount,nofail                          0 0
+/dev/sdx11 /mnt/rwonly             auto x-systemd.rw-only                                   0 0
+/dev/sdx12 /mnt/mkfs               ext4 x-systemd.makefs                                    0 0
+/dev/sdx13 /mnt/growfs             auto x-systemd.growfs                                    0 0
+/dev/sdx14 /mnt/pcrfs              auto x-systemd.pcrfs                                     0 0
+/dev/sdx15 /mnt/noauto             auto noauto                                              0 0
+/dev/sdx16 /mnt/nofail             auto nofail                                              0 0
+/dev/sdx17 /mnt/wantedby-automount auto x-systemd.wanted-by=foo.service,x-systemd.automount 0 0