SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30284 from YHNdnzj/fstab-wantedby-defaultdeps

Browse Source 
fstab-generator: disable default deps if x-systemd.{wanted,required}-by= is used
This commit is contained in:
Lennart Poettering
2023-12-21 22:47:54 +01:00
committed by GitHub
parent dc6522b18f f611721fa2
commit 66f3da245b
13 changed files with 149 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test-fstab-generator/test-18-options.fstab.expected.sysroot/foo.service.wants/mnt-wantedby-automount.automount
Symlink
+1
View File
@@ -0,0 +1 @@
../mnt-wantedby-automount.automount
test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-requiredby.mount
+3 -1
View File
@@ -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]
test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.automount
+8
View File
@@ -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
test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby-automount.mount
+14
View File
@@ -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
test/test-fstab-generator/test-18-options.fstab.expected.sysroot/mnt-wantedby.mount
+3 -1
View File
@@ -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]
test/test-fstab-generator/test-18-options.fstab.expected/foo.service.wants/mnt-wantedby-automount.automount
Symlink
+1
View File
@@ -0,0 +1 @@
../mnt-wantedby-automount.automount
test/test-fstab-generator/test-18-options.fstab.expected/mnt-requiredby.mount
+3 -1
View File
@@ -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]
test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.automount
+8
View File
@@ -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
test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby-automount.mount
+14
View File
@@ -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
test/test-fstab-generator/test-18-options.fstab.expected/mnt-wantedby.mount
+3 -1
View File
@@ -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]
test/test-fstab-generator/test-18-options.fstab.input
+17 -16
View File
@@ -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