fstab-generator: support for x-systemd.onfailure (#42440)
1. test-fstab-generator: fix inverted /mnt symlink guard The test-18-options.fstab.input scenario was guarded by a check that was always true on a normal system, so it was silently skipped and its fixtures had drifted out of sync with actual generator output. This commit fixes the guard and repairs the stale fixtures it exposed. 2. fstab-generator: support for x-systemd.onfailure Add support for the x-systemd.onfailure= fstab option in systemd-fstab-generator. This allows configuring OnFailure= dependencies for generated mount units directly through /etc/fstab. For example: /dev/sda1 /data ext4 defaults,x-systemd.onfailure=emergency.target 0 2 results in the generated mount unit containing: [Unit] OnFailure=emergency.target This makes it possible to attach recovery targets or services to mount failures directly from fstab configuration. Add documentation and generator tests.
This commit is contained in:
Yu Watanabe
@@ -67,15 +67,15 @@ test_one() (
|
||||
|
||||
# .deb packager seems to dislike files named with backslash. So, as a workaround, we store files
|
||||
# without backslash in .expected.
|
||||
for i in "$out"/**/*\\*.{mount,swap}; do
|
||||
for i in "$out"/**/*\\*.{mount,swap,automount}; do
|
||||
k="${i//\\/}"
|
||||
if [[ "$i" != "$k" ]]; then
|
||||
if [[ -f "$i" ]]; then
|
||||
mv "$i" "$k"
|
||||
elif [[ -L "$i" ]]; then
|
||||
if [[ -L "$i" ]]; then
|
||||
dest=$(readlink "$i")
|
||||
rm "$i"
|
||||
ln -s "${dest//\\/}" "$k"
|
||||
elif [[ -f "$i" ]]; then
|
||||
mv "$i" "$k"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
@@ -130,8 +130,7 @@ test_one() (
|
||||
for f in "$src"/test-*.input; do
|
||||
# If /mnt is a symlink, then the expected output from this
|
||||
# test scenario will not match the actual output
|
||||
if test "$f" = "$src/test-18-options.fstab.input" -a "$(readlink /mnt)" != "/mnt"
|
||||
then
|
||||
if [[ "$f" == "$src/test-18-options.fstab.input" && -L /mnt ]]; then
|
||||
echo "Skip $f because /mnt is a symlink"
|
||||
continue
|
||||
fi
|
||||
|
||||
-1
@@ -1 +0,0 @@
|
||||
../mnt-wantedby-automount.automount
|
||||
+1
@@ -0,0 +1 @@
|
||||
../mnt-wantedbyx2dautomount.automount
|
||||
+1
@@ -0,0 +1 @@
|
||||
../mnt-onfailure.mount
|
||||
+1
@@ -0,0 +1 @@
|
||||
../mnt-onfailuremulti.mount
|
||||
@@ -0,0 +1,13 @@
|
||||
# Automatically generated by systemd-fstab-generator
|
||||
|
||||
[Unit]
|
||||
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
||||
SourcePath=/etc/fstab
|
||||
OnFailure=foo.service
|
||||
Before=local-fs.target
|
||||
After=blockdev@dev-sdx18.target
|
||||
|
||||
[Mount]
|
||||
What=/dev/sdx18
|
||||
Where=/mnt/onfailure
|
||||
Options=x-systemd.onfailure=foo.service
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
# Automatically generated by systemd-fstab-generator
|
||||
|
||||
[Unit]
|
||||
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
||||
SourcePath=/etc/fstab
|
||||
OnFailure=foo.service bar.service
|
||||
Before=local-fs.target
|
||||
After=blockdev@dev-sdx19.target
|
||||
|
||||
[Mount]
|
||||
What=/dev/sdx19
|
||||
Where=/mnt/onfailuremulti
|
||||
Options=x-systemd.onfailure=foo.service,x-systemd.onfailure=bar.service
|
||||
@@ -3,8 +3,8 @@
|
||||
[Unit]
|
||||
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
||||
SourcePath=/etc/fstab
|
||||
After=foo.service
|
||||
Requires=foo.service
|
||||
After=foo.service
|
||||
Before=local-fs.target
|
||||
After=blockdev@dev-sdx5.target
|
||||
|
||||
|
||||
+1
-1
@@ -10,5 +10,5 @@ After=blockdev@dev-sdx17.target
|
||||
|
||||
[Mount]
|
||||
What=/dev/sdx17
|
||||
Where=/mnt/wantedby
|
||||
Where=/mnt/wantedby-automount
|
||||
Options=x-systemd.wanted-by=foo.service,x-systemd.automount
|
||||
-1
@@ -1 +0,0 @@
|
||||
../mnt-wantedby-automount.automount
|
||||
+1
@@ -0,0 +1 @@
|
||||
../mnt-wantedbyx2dautomount.automount
|
||||
+1
@@ -0,0 +1 @@
|
||||
../mnt-onfailure.mount
|
||||
+1
@@ -0,0 +1 @@
|
||||
../mnt-onfailuremulti.mount
|
||||
@@ -0,0 +1,13 @@
|
||||
# Automatically generated by systemd-fstab-generator
|
||||
|
||||
[Unit]
|
||||
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
||||
SourcePath=/etc/fstab
|
||||
OnFailure=foo.service
|
||||
Before=local-fs.target
|
||||
After=blockdev@dev-sdx18.target
|
||||
|
||||
[Mount]
|
||||
What=/dev/sdx18
|
||||
Where=/mnt/onfailure
|
||||
Options=x-systemd.onfailure=foo.service
|
||||
@@ -0,0 +1,13 @@
|
||||
# Automatically generated by systemd-fstab-generator
|
||||
|
||||
[Unit]
|
||||
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
||||
SourcePath=/etc/fstab
|
||||
OnFailure=foo.service bar.service
|
||||
Before=local-fs.target
|
||||
After=blockdev@dev-sdx19.target
|
||||
|
||||
[Mount]
|
||||
What=/dev/sdx19
|
||||
Where=/mnt/onfailuremulti
|
||||
Options=x-systemd.onfailure=foo.service,x-systemd.onfailure=bar.service
|
||||
@@ -3,8 +3,8 @@
|
||||
[Unit]
|
||||
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
||||
SourcePath=/etc/fstab
|
||||
After=foo.service
|
||||
Requires=foo.service
|
||||
After=foo.service
|
||||
Before=local-fs.target
|
||||
After=blockdev@dev-sdx5.target
|
||||
|
||||
|
||||
+1
-1
@@ -10,5 +10,5 @@ After=blockdev@dev-sdx17.target
|
||||
|
||||
[Mount]
|
||||
What=/dev/sdx17
|
||||
Where=/mnt/wantedby
|
||||
Where=/mnt/wantedby-automount
|
||||
Options=x-systemd.wanted-by=foo.service,x-systemd.automount
|
||||
@@ -15,3 +15,5 @@
|
||||
/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
|
||||
/dev/sdx18 /mnt/onfailure auto x-systemd.onfailure=foo.service 0 0
|
||||
/dev/sdx19 /mnt/onfailuremulti auto x-systemd.onfailure=foo.service,x-systemd.onfailure=bar.service 0 0
|
||||
|
||||
Reference in New Issue
Block a user