system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-01 13:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: add test cases for defining mount and swap units from kernel cmdline

Browse source
This commit is contained in:
Yu Watanabe 2023-05-12 03:55:46 +09:00
parent 55365b0a23
commit 93ec924c41
27 changed files with 163 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/test-fstab-generator.sh
View file

@ -28,11 +28,14 @@ for f in "$src"/test-*.input; do
trap "rm -rf '$out'" EXIT INT QUIT PIPE
exp="${f%.input}.expected"
if [[ "${f##*/}" =~ swap ]] && systemd-detect-virt --container >/dev/null; then
exp="${exp}.container"
fi
if [[ "${f##*/}" =~ \.fstab\.input ]]; then
SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD=yes SYSTEMD_SYSFS_CHECK=no SYSTEMD_PROC_CMDLINE="fstab=yes root=fstab" SYSTEMD_FSTAB="$f" SYSTEMD_SYSROOT_FSTAB="/dev/null" $generator "$out" "$out" "$out"
else
SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD=yes SYSTEMD_PROC_CMDLINE="fstab=no $(cat "$f")" $generator "$out" "$out" "$out"
SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD=yes SYSTEMD_SYSFS_CHECK=no 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.
@ -55,6 +58,21 @@ for f in "$src"/test-*.input; do
done
fi
# .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
k="${i//\\/}"
if [[ "$i" != "$k" ]]; then
if [[ -f "$i" ]]; then
mv "$i" "$k"
elif [[ -L "$i" ]]; then
dest=$(readlink "$i")
rm "$i"
ln -s "${dest//\\/}" "$k"
fi
fi
done
# We store empty files rather than dead symlinks, so that they don't get pruned when packaged up, so compare
# the list of filenames rather than their content
if ! diff -u <(find "$out" -printf '%P\n' | sort) <(find "$exp" -printf '%P\n' | sort); then

11
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/hoge-without_fstype.mount Normal file
View file

@ -0,0 +1,11 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
Before=local-fs.target
After=blockdev@dev-sdx3.target
[Mount]
What=/dev/sdx3
Where=/hoge/without_fstype

11
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/hoge-without_options.mount Normal file
View file

@ -0,0 +1,11 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
Before=local-fs.target
After=blockdev@dev-sdx2.target
[Mount]
What=/dev/sdx2
Where=/hoge/without_options

12
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/hoge-withx20space.mount Normal file
View file

@ -0,0 +1,12 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
Before=remote-fs.target
[Mount]
What=//foo￾bar
Where=/hoge/with space
Type=cifs
Options=rw

5
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/initrd-root-device.target.d/50-root-device.conf Normal file
View file

@ -0,0 +1,5 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Requires=dev-sdx1.device
After=dev-sdx1.device

1
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/initrd-root-fs.target.requires/sysroot.mount Symbolic link
View file

@ -0,0 +1 @@
../sysroot.mount

1
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/initrd-usr-fs.target.requires/sysroot.mount Symbolic link
View file

@ -0,0 +1 @@
../sysroot.mount

1
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/local-fs.target.requires/hoge-without_fstype.mount Symbolic link
View file

@ -0,0 +1 @@
../hoge-without_fstype.mount

1
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/local-fs.target.requires/hoge-without_options.mount Symbolic link
View file

@ -0,0 +1 @@
../hoge-without_options.mount

1
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/remote-fs.target.requires/hoge-withx20space.mount Symbolic link
View file

@ -0,0 +1 @@
../hoge-withx20space.mount

11
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/sysroot.mount Normal file
View file

@ -0,0 +1,11 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
Before=initrd-root-fs.target
After=blockdev@dev-sdx1.target
[Mount]
What=/dev/sdx1
Where=/sysroot

5
test/test-fstab-generator/test-19-mounts-from-cmdline.input Normal file
View file

@ -0,0 +1,5 @@
systemd.mount-extra=/dev/sdx1:/sysroot:auto:defaults
systemd.mount-extra=/dev/sdx2:/hoge/without_options:auto
systemd.mount-extra=/dev/sdx3:/hoge/without_fstype
systemd.mount-extra=/dev/sdx4
systemd.mount-extra=//foo\ufffebar:/hoge/with\x20space:cifs:rw,seclabel

0
test/test-fstab-generator/test-20-swap-from-cmdline.expected.container/initrd-usr-fs.target.requires/sysroot.mount Normal file
View file

9
test/test-fstab-generator/test-20-swap-from-cmdline.expected/dev-sdy1.swap Normal file
View file

@ -0,0 +1,9 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
After=blockdev@dev-sdy1.target
[Swap]
What=/dev/sdy1

10
test/test-fstab-generator/test-20-swap-from-cmdline.expected/dev-sdy2.swap Normal file
View file

@ -0,0 +1,10 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
After=blockdev@dev-sdy2.target
[Swap]
What=/dev/sdy2
Options=x-systemd.makefs

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected/dev-sdy2.swap.requires/systemd-mkswap@dev-sdy2.service Symbolic link
View file

@ -0,0 +1 @@
../systemd-mkswap@dev-sdy2.service

10
test/test-fstab-generator/test-20-swap-from-cmdline.expected/dev-sdy3.swap Normal file
View file

@ -0,0 +1,10 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
After=blockdev@dev-sdy3.target
[Swap]
What=/dev/sdy3
Options=x-systemd.makefs

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected/dev-sdy3.swap.requires/systemd-mkswap@dev-sdy3.service Symbolic link
View file

@ -0,0 +1 @@
../systemd-mkswap@dev-sdy3.service

9
test/test-fstab-generator/test-20-swap-from-cmdline.expected/dev-sdy4.swap Normal file
View file

@ -0,0 +1,9 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
After=blockdev@dev-sdy4.target
[Swap]
What=/dev/sdy4

0
test/test-fstab-generator/test-20-swap-from-cmdline.expected/initrd-usr-fs.target.requires/sysroot.mount Normal file
View file

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected/swap.target.requires/dev-sdy1.swap Symbolic link
View file

@ -0,0 +1 @@
../dev-sdy1.swap

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected/swap.target.requires/dev-sdy2.swap Symbolic link
View file

@ -0,0 +1 @@
../dev-sdy2.swap

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected/swap.target.requires/dev-sdy3.swap Symbolic link
View file

@ -0,0 +1 @@
../dev-sdy3.swap

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected/swap.target.requires/dev-sdy4.swap Symbolic link
View file

@ -0,0 +1 @@
../dev-sdy4.swap

18
test/test-fstab-generator/test-20-swap-from-cmdline.expected/systemd-mkswap@dev-sdy2.service Normal file
View file

@ -0,0 +1,18 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Description=Make Swap on %f
Documentation=man:systemd-mkswap@.service(8)
DefaultDependencies=no
BindsTo=%i.device
After=%i.device
Before=dev-sdy2.swap
Conflicts=shutdown.target
Before=shutdown.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/lib/systemd/systemd-makefs swap /dev/sdy2
TimeoutSec=0

18
test/test-fstab-generator/test-20-swap-from-cmdline.expected/systemd-mkswap@dev-sdy3.service Normal file
View file

@ -0,0 +1,18 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Description=Make Swap on %f
Documentation=man:systemd-mkswap@.service(8)
DefaultDependencies=no
BindsTo=%i.device
After=%i.device
Before=dev-sdy3.swap
Conflicts=shutdown.target
Before=shutdown.target
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/lib/systemd/systemd-makefs swap /dev/sdy3
TimeoutSec=0

4
test/test-fstab-generator/test-20-swap-from-cmdline.input Normal file
View file

@ -0,0 +1,4 @@
systemd.mount-extra=/dev/sdy1:none:swap
systemd.mount-extra=/dev/sdy2:none:swap:x-systemd.makefs
systemd.swap-extra=/dev/sdy3:x-systemd.makefs,nofail
systemd.swap-extra=/dev/sdy4