shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-09-21 09:44:45 +03:00
Code Activity

test-fstab-generator: add more tests for systemd.mount-extra= and friends

Browse Source
This commit is contained in:
Yu Watanabe
2023-07-26 07:37:29 +09:00
parent aeded6b0b5
commit 03de154a1e
20 changed files with 112 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/test-fstab-generator/test-19-mounts-from-cmdline.expected.sysroot/foo-also_in_initrd.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=local-fs.target
After=blockdev@dev-sdx6.target
[Mount]
What=/dev/sdx6
Where=/foo/also_in_initrd
Options=x-initrd.mount

11
test/test-fstab-generator/test-19-mounts-from-cmdline.expected.sysroot/foo-not_in_initrd.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-sdx7.target
[Mount]
What=/dev/sdx7
Where=/foo/not_in_initrd

1
test/test-fstab-generator/test-19-mounts-from-cmdline.expected.sysroot/local-fs.target.requires/foo-also_in_initrd.mount Symbolic link
View File

@@ -0,0 +1 @@
../foo-also_in_initrd.mount

1
test/test-fstab-generator/test-19-mounts-from-cmdline.expected.sysroot/local-fs.target.requires/foo-not_in_initrd.mount Symbolic link
View File

@@ -0,0 +1 @@
../foo-not_in_initrd.mount

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

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

11
test/test-fstab-generator/test-19-mounts-from-cmdline.expected.sysroot/usr.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-sdx5.target
[Mount]
What=/dev/sdx5
Where=/usr

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

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

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

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

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

@@ -0,0 +1 @@
../sysusr-usr.mount

13
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/sysroot-foo-also_in_initrd.mount Normal file
View File

@@ -0,0 +1,13 @@
# Automatically generated by systemd-fstab-generator
[Unit]
Documentation=man:fstab(5) man:systemd-fstab-generator(8)
SourcePath=/proc/cmdline
Before=initrd-fs.target
After=blockdev@dev-sdx6.target
[Mount]
What=/dev/sdx6
# Canonicalized from /foo/also_in_initrd
Where=/sysroot/foo/also_in_initrd
Options=x-initrd.mount

11
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/sysroot-usr.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-fs.target
[Mount]
What=/sysusr/usr
Where=/sysroot/usr
Options=bind

11
test/test-fstab-generator/test-19-mounts-from-cmdline.expected/sysusr-usr.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-usr-fs.target
After=blockdev@dev-sdx5.target
[Mount]
What=/dev/sdx5
Where=/sysusr/usr

3
test/test-fstab-generator/test-19-mounts-from-cmdline.input
View File

@@ -3,3 +3,6 @@ rd.systemd.mount-extra=/dev/sdx2:/hoge/without_options:auto
rd.systemd.mount-extra=/dev/sdx3:/hoge/without_fstype rd.systemd.mount-extra=/dev/sdx3:/hoge/without_fstype
rd.systemd.mount-extra=/dev/sdx4 rd.systemd.mount-extra=/dev/sdx4
rd.systemd.mount-extra=//foo\ufffebar:/hoge/with\x20space:cifs:rw,seclabel rd.systemd.mount-extra=//foo\ufffebar:/hoge/with\x20space:cifs:rw,seclabel
systemd.mount-extra=/dev/sdx5:/usr:auto:defaults
systemd.mount-extra=/dev/sdx6:/foo/also_in_initrd:auto:x-initrd.mount
systemd.mount-extra=/dev/sdx7:/foo/not_in_initrd:auto:defaults

10
test/test-fstab-generator/test-20-swap-from-cmdline.expected.sysroot/dev-sdy5.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-sdy5.target
[Swap]
What=/dev/sdy5
Options=x-initrd.mount

9
test/test-fstab-generator/test-20-swap-from-cmdline.expected.sysroot/dev-sdy6.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-sdy6.target
[Swap]
What=/dev/sdy6

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected.sysroot/swap.target.requires/dev-sdy5.swap Symbolic link
View File

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

1
test/test-fstab-generator/test-20-swap-from-cmdline.expected.sysroot/swap.target.requires/dev-sdy6.swap Symbolic link
View File

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

10
test/test-fstab-generator/test-20-swap-from-cmdline.expected/dev-sdy5.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-sdy5.target
[Swap]
What=/dev/sdy5
Options=x-initrd.mount

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

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

2
test/test-fstab-generator/test-20-swap-from-cmdline.input
View File

@@ -2,3 +2,5 @@ rd.systemd.mount-extra=/dev/sdy1:none:swap
rd.systemd.mount-extra=/dev/sdy2:none:swap:x-systemd.makefs rd.systemd.mount-extra=/dev/sdy2:none:swap:x-systemd.makefs
rd.systemd.swap-extra=/dev/sdy3:x-systemd.makefs,nofail rd.systemd.swap-extra=/dev/sdy3:x-systemd.makefs,nofail
rd.systemd.swap-extra=/dev/sdy4 rd.systemd.swap-extra=/dev/sdy4
systemd.swap-extra=/dev/sdy5:x-initrd.mount
systemd.swap-extra=/dev/sdy6