From 9afc07262dd2b37a20094909ab0a8cddb29cefc8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 19 May 2023 09:31:51 +0900 Subject: [PATCH] test-fstab-generator: add tests for mount options (cherry picked from commit 82c29dbee0ae4c438d25482083facc75f84bc5ee) Related: #2190226 --- test/test-fstab-generator.sh | 9 +++++++++ .../foo.service.requires/mnt-requiredby.mount | 1 + .../foo.service.wants/mnt-wantedby.mount | 1 + .../50-root-device.conf | 5 +++++ .../sysroot.mount | 1 + .../sysroot.mount | 1 + ...rder-systemd-growfs@mnt-growfs.service.conf | 4 ++++ .../local-fs.target.requires/mnt-after.mount | 1 + .../mnt-automount1.automount | 1 + .../local-fs.target.requires/mnt-before.mount | 1 + .../local-fs.target.requires/mnt-growfs.mount | 1 + .../local-fs.target.requires/mnt-mkfs.mount | 1 + .../local-fs.target.requires/mnt-pcrfs.mount | 1 + .../mnt-reqmounts.mount | 1 + .../mnt-requires.mount | 1 + .../local-fs.target.requires/mnt-rwonly.mount | 1 + .../local-fs.target.requires/mnt-timeout.mount | 1 + .../mnt-automount2.automount | 1 + .../local-fs.target.wants/mnt-nofail.mount | 1 + .../mnt-after.mount | 13 +++++++++++++ .../mnt-automount1.automount | 9 +++++++++ .../mnt-automount1.mount | 12 ++++++++++++ .../mnt-automount2.automount | 8 ++++++++ .../mnt-automount2.mount | 11 +++++++++++ .../mnt-before.mount | 13 +++++++++++++ .../mnt-growfs.mount | 12 ++++++++++++ .../systemd-growfs@mnt-growfs.service | 0 .../mnt-mkfs.mount | 13 +++++++++++++ .../systemd-makefs@dev-sdx12.service | 1 + .../mnt-noauto.mount | 12 ++++++++++++ .../mnt-nofail.mount | 11 +++++++++++ .../mnt-pcrfs.mount | 12 ++++++++++++ .../mnt-reqmounts.mount | 13 +++++++++++++ .../mnt-requiredby.mount | 12 ++++++++++++ .../mnt-requires.mount | 14 ++++++++++++++ .../mnt-rwonly.mount | 13 +++++++++++++ .../mnt-timeout.mount | 13 +++++++++++++ .../mnt-wantedby.mount | 12 ++++++++++++ .../sysroot.mount | 13 +++++++++++++ .../systemd-fsck-root.service | 17 +++++++++++++++++ .../systemd-makefs@dev-sdx12.service | 18 ++++++++++++++++++ .../test-18-options.fstab.input | 16 ++++++++++++++++ 42 files changed, 302 insertions(+) create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/foo.service.requires/mnt-requiredby.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-device.target.d/50-root-device.conf create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-fs.target.requires/sysroot.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/initrd-usr-fs.target.requires/sysroot.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.d/50-order-systemd-growfs@mnt-growfs.service.conf create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-after.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-automount1.automount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-before.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-growfs.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-mkfs.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-pcrfs.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-reqmounts.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-requires.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-rwonly.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-timeout.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-automount2.automount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-nofail.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-after.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.automount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.automount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-before.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-growfs.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-growfs.mount.wants/systemd-growfs@mnt-growfs.service create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount create mode 120000 test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount.requires/systemd-makefs@dev-sdx12.service create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-noauto.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-nofail.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-pcrfs.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-reqmounts.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-requiredby.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-requires.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-rwonly.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-timeout.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/sysroot.mount create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/systemd-fsck-root.service create mode 100644 test/test-fstab-generator/test-18-options.fstab.expected/systemd-makefs@dev-sdx12.service create mode 100644 test/test-fstab-generator/test-18-options.fstab.input diff --git a/test/test-fstab-generator.sh b/test/test-fstab-generator.sh index c844d0dae1..7df67ce305 100755 --- a/test/test-fstab-generator.sh +++ b/test/test-fstab-generator.sh @@ -35,6 +35,15 @@ for f in "$src"/test-*.input; do SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD=yes SYSTEMD_PROC_CMDLINE="fstab=no $(cat "$f")" $generator "$out" "$out" "$out" fi + # The option x-systemd.growfs creates symlink to system's systemd-growfs@.service in .mount.wants directory. + # The system that the test is currently running on may not have or may have outdated unit file. + # Let's replace the symlink with an empty file. + for i in "$out"/*/systemd-growfs@*.service; do + [[ -L "$i" ]] || continue + rm "$i" + touch "$i" + done + # For split-usr system for i in "$out"/systemd-*.service; do sed -i -e 's:ExecStart=/lib/systemd/:ExecStart=/usr/lib/systemd/:' "$i" diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.requires/mnt-requiredby.mount b/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.requires/mnt-requiredby.mount new file mode 120000 index 0000000000..6b012b09ef --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.requires/mnt-requiredby.mount @@ -0,0 +1 @@ +../mnt-requiredby.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby.mount b/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby.mount new file mode 120000 index 0000000000..cdf21276b6 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby.mount @@ -0,0 +1 @@ +../mnt-wantedby.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-device.target.d/50-root-device.conf b/test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-device.target.d/50-root-device.conf new file mode 100644 index 0000000000..47c4232223 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-device.target.d/50-root-device.conf @@ -0,0 +1,5 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Requires=dev-sdx1.device +After=dev-sdx1.device diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-fs.target.requires/sysroot.mount b/test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-fs.target.requires/sysroot.mount new file mode 120000 index 0000000000..0c969cdbd4 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/initrd-root-fs.target.requires/sysroot.mount @@ -0,0 +1 @@ +../sysroot.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/initrd-usr-fs.target.requires/sysroot.mount b/test/test-fstab-generator/test-18-options.fstab.expected/initrd-usr-fs.target.requires/sysroot.mount new file mode 120000 index 0000000000..0c969cdbd4 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/initrd-usr-fs.target.requires/sysroot.mount @@ -0,0 +1 @@ +../sysroot.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.d/50-order-systemd-growfs@mnt-growfs.service.conf b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.d/50-order-systemd-growfs@mnt-growfs.service.conf new file mode 100644 index 0000000000..ac770bcb51 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.d/50-order-systemd-growfs@mnt-growfs.service.conf @@ -0,0 +1,4 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +After=systemd-growfs@mnt-growfs.service diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-after.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-after.mount new file mode 120000 index 0000000000..68364ef19c --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-after.mount @@ -0,0 +1 @@ +../mnt-after.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-automount1.automount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-automount1.automount new file mode 120000 index 0000000000..3638a8c90e --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-automount1.automount @@ -0,0 +1 @@ +../mnt-automount1.automount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-before.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-before.mount new file mode 120000 index 0000000000..3a50a40d5f --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-before.mount @@ -0,0 +1 @@ +../mnt-before.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-growfs.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-growfs.mount new file mode 120000 index 0000000000..cb05081e45 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-growfs.mount @@ -0,0 +1 @@ +../mnt-growfs.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-mkfs.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-mkfs.mount new file mode 120000 index 0000000000..51f897e419 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-mkfs.mount @@ -0,0 +1 @@ +../mnt-mkfs.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-pcrfs.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-pcrfs.mount new file mode 120000 index 0000000000..276dfc0731 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-pcrfs.mount @@ -0,0 +1 @@ +../mnt-pcrfs.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-reqmounts.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-reqmounts.mount new file mode 120000 index 0000000000..7efce8da9a --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-reqmounts.mount @@ -0,0 +1 @@ +../mnt-reqmounts.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-requires.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-requires.mount new file mode 120000 index 0000000000..34a6aad26f --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-requires.mount @@ -0,0 +1 @@ +../mnt-requires.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-rwonly.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-rwonly.mount new file mode 120000 index 0000000000..d03abd2353 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-rwonly.mount @@ -0,0 +1 @@ +../mnt-rwonly.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-timeout.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-timeout.mount new file mode 120000 index 0000000000..b0ec730825 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.requires/mnt-timeout.mount @@ -0,0 +1 @@ +../mnt-timeout.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-automount2.automount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-automount2.automount new file mode 120000 index 0000000000..a30481ec1f --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-automount2.automount @@ -0,0 +1 @@ +../mnt-automount2.automount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-nofail.mount b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-nofail.mount new file mode 120000 index 0000000000..b82bbad730 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/local-fs.target.wants/mnt-nofail.mount @@ -0,0 +1 @@ +../mnt-nofail.mount \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-after.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-after.mount new file mode 100644 index 0000000000..2aebb686a7 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-after.mount @@ -0,0 +1,13 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +After=foo.service +Before=local-fs.target +After=blockdev@dev-sdx3.target + +[Mount] +What=/dev/sdx3 +Where=/mnt/after +Options=x-systemd.after=foo.service diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.automount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.automount new file mode 100644 index 0000000000..e376689b67 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.automount @@ -0,0 +1,9 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +SourcePath=/etc/fstab +Documentation=man:fstab(5) man:systemd-fstab-generator(8) + +[Automount] +Where=/mnt/automount1 +TimeoutIdleSec=30min diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.mount new file mode 100644 index 0000000000..1413292c79 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount1.mount @@ -0,0 +1,12 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx9.target + +[Mount] +What=/dev/sdx9 +Where=/mnt/automount1 +Options=x-systemd.automount,x-systemd.idle-timeout=30m diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.automount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.automount new file mode 100644 index 0000000000..e05d3976ef --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.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/automount2 diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.mount new file mode 100644 index 0000000000..1eba08c9f7 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-automount2.mount @@ -0,0 +1,11 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +After=blockdev@dev-sdx10.target + +[Mount] +What=/dev/sdx10 +Where=/mnt/automount2 +Options=x-systemd.automount,nofail diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-before.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-before.mount new file mode 100644 index 0000000000..eea084b7b6 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-before.mount @@ -0,0 +1,13 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=foo.service +Before=local-fs.target +After=blockdev@dev-sdx4.target + +[Mount] +What=/dev/sdx4 +Where=/mnt/before +Options=x-systemd.before=foo.service diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-growfs.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-growfs.mount new file mode 100644 index 0000000000..bbe958c076 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-growfs.mount @@ -0,0 +1,12 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx13.target + +[Mount] +What=/dev/sdx13 +Where=/mnt/growfs +Options=x-systemd.growfs diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-growfs.mount.wants/systemd-growfs@mnt-growfs.service b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-growfs.mount.wants/systemd-growfs@mnt-growfs.service new file mode 100644 index 0000000000..e69de29bb2 diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount new file mode 100644 index 0000000000..be4c8fa17f --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount @@ -0,0 +1,13 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx12.target + +[Mount] +What=/dev/sdx12 +Where=/mnt/mkfs +Type=ext4 +Options=x-systemd.makefs diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount.requires/systemd-makefs@dev-sdx12.service b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount.requires/systemd-makefs@dev-sdx12.service new file mode 120000 index 0000000000..fe80548a68 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-mkfs.mount.requires/systemd-makefs@dev-sdx12.service @@ -0,0 +1 @@ +../systemd-makefs@dev-sdx12.service \ No newline at end of file diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-noauto.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-noauto.mount new file mode 100644 index 0000000000..4d52a6e698 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-noauto.mount @@ -0,0 +1,12 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx15.target + +[Mount] +What=/dev/sdx15 +Where=/mnt/noauto +Options=noauto diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-nofail.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-nofail.mount new file mode 100644 index 0000000000..3c20b652b0 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-nofail.mount @@ -0,0 +1,11 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +After=blockdev@dev-sdx16.target + +[Mount] +What=/dev/sdx16 +Where=/mnt/nofail +Options=nofail diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-pcrfs.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-pcrfs.mount new file mode 100644 index 0000000000..2c070e695a --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-pcrfs.mount @@ -0,0 +1,12 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx14.target + +[Mount] +What=/dev/sdx14 +Where=/mnt/pcrfs +Options=x-systemd.pcrfs diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-reqmounts.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-reqmounts.mount new file mode 100644 index 0000000000..c21ccd27ba --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-reqmounts.mount @@ -0,0 +1,13 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +RequiresMountsFor=/hoge +Before=local-fs.target +After=blockdev@dev-sdx6.target + +[Mount] +What=/dev/sdx6 +Where=/mnt/reqmounts +Options=x-systemd.requires-mounts-for=/hoge 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 new file mode 100644 index 0000000000..5edc4ddf22 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requiredby.mount @@ -0,0 +1,12 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx8.target + +[Mount] +What=/dev/sdx8 +Where=/mnt/requiredby +Options=x-systemd.required-by=foo.service diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requires.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requires.mount new file mode 100644 index 0000000000..8386616593 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-requires.mount @@ -0,0 +1,14 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +After=foo.service +Requires=foo.service +Before=local-fs.target +After=blockdev@dev-sdx5.target + +[Mount] +What=/dev/sdx5 +Where=/mnt/requires +Options=x-systemd.requires=foo.service diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-rwonly.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-rwonly.mount new file mode 100644 index 0000000000..8649734386 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-rwonly.mount @@ -0,0 +1,13 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx11.target + +[Mount] +What=/dev/sdx11 +Where=/mnt/rwonly +Options=x-systemd.rw-only +ReadWriteOnly=yes diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/mnt-timeout.mount b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-timeout.mount new file mode 100644 index 0000000000..09d772a52b --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-timeout.mount @@ -0,0 +1,13 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx2.target + +[Mount] +What=/dev/sdx2 +Where=/mnt/timeout +TimeoutSec=10min +Options=x-systemd.mount-timeout=10m 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 new file mode 100644 index 0000000000..e12df820d4 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby.mount @@ -0,0 +1,12 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=local-fs.target +After=blockdev@dev-sdx7.target + +[Mount] +What=/dev/sdx7 +Where=/mnt/wantedby +Options=x-systemd.wanted-by=foo.service diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/sysroot.mount b/test/test-fstab-generator/test-18-options.fstab.expected/sysroot.mount new file mode 100644 index 0000000000..0e8a701be9 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/sysroot.mount @@ -0,0 +1,13 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Documentation=man:fstab(5) man:systemd-fstab-generator(8) +SourcePath=/etc/fstab +Before=initrd-root-fs.target +Requires=systemd-fsck-root.service +After=systemd-fsck-root.service +After=blockdev@dev-sdx1.target + +[Mount] +What=/dev/sdx1 +Where=/sysroot diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/systemd-fsck-root.service b/test/test-fstab-generator/test-18-options.fstab.expected/systemd-fsck-root.service new file mode 100644 index 0000000000..95d943b87a --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/systemd-fsck-root.service @@ -0,0 +1,17 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Description=File System Check on /dev/sdx1 +Documentation=man:systemd-fsck-root.service(8) + +DefaultDependencies=no +BindsTo=dev-sdx1.device +Conflicts=shutdown.target +After=initrd-root-device.target local-fs-pre.target dev-sdx1.device +Before=shutdown.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/systemd-fsck /dev/sdx1 +TimeoutSec=0 diff --git a/test/test-fstab-generator/test-18-options.fstab.expected/systemd-makefs@dev-sdx12.service b/test/test-fstab-generator/test-18-options.fstab.expected/systemd-makefs@dev-sdx12.service new file mode 100644 index 0000000000..303c1ee680 --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.expected/systemd-makefs@dev-sdx12.service @@ -0,0 +1,18 @@ +# Automatically generated by systemd-fstab-generator + +[Unit] +Description=Make File System on %f +Documentation=man:systemd-makefs@.service(8) + +DefaultDependencies=no +BindsTo=%i.device +After=%i.device +Before=systemd-fsck@%i.service mnt-mkfs.mount +Conflicts=shutdown.target +Before=shutdown.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/systemd-makefs ext4 /dev/sdx12 +TimeoutSec=0 diff --git a/test/test-fstab-generator/test-18-options.fstab.input b/test/test-fstab-generator/test-18-options.fstab.input new file mode 100644 index 0000000000..98ef0b9fba --- /dev/null +++ b/test/test-fstab-generator/test-18-options.fstab.input @@ -0,0 +1,16 @@ +/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