You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
156 lines
7.7 KiB
156 lines
7.7 KiB
From 337826320020e4e1e8f6be62c3c65d5b157bb58d Mon Sep 17 00:00:00 2001
|
|
From: Lily Foster <lily@lily.flowers>
|
|
Date: Wed, 25 Jan 2023 18:52:30 -0500
|
|
Subject: [PATCH] test: add fstab file support for fstab-generator tests
|
|
|
|
(cherry picked from commit ef0c7ab6ac1ad2a38988fd4aa959aaa0408f2f4b)
|
|
|
|
Related: #2190226
|
|
---
|
|
test/test-fstab-generator.sh | 6 +++++-
|
|
.../initrd-fs.target.requires/sysroot-usr.mount | 0
|
|
.../50-root-device.conf | 5 +++++
|
|
.../initrd-root-fs.target.requires/sysroot.mount | 0
|
|
.../initrd-usr-fs.target.requires/sysroot.mount | 0
|
|
.../sysusr-usr.mount | 0
|
|
.../sysroot-usr.mount | 11 +++++++++++
|
|
.../sysroot.mount | 13 +++++++++++++
|
|
.../systemd-fsck-root.service | 16 ++++++++++++++++
|
|
.../sysusr-usr.mount | 11 +++++++++++
|
|
.../test-17-initrd-sysroot.fstab.input | 2 ++
|
|
11 files changed, 63 insertions(+), 1 deletion(-)
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-fs.target.requires/sysroot-usr.mount
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-root-device.target.d/50-root-device.conf
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-root-fs.target.requires/sysroot.mount
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-usr-fs.target.requires/sysroot.mount
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-usr-fs.target.requires/sysusr-usr.mount
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysroot-usr.mount
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysroot.mount
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/systemd-fsck-root.service
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysusr-usr.mount
|
|
create mode 100644 test/test-fstab-generator/test-17-initrd-sysroot.fstab.input
|
|
|
|
diff --git a/test/test-fstab-generator.sh b/test/test-fstab-generator.sh
|
|
index 7c060dfac7..c86914a107 100755
|
|
--- a/test/test-fstab-generator.sh
|
|
+++ b/test/test-fstab-generator.sh
|
|
@@ -26,7 +26,11 @@ for f in "$src"/test-*.input; do
|
|
trap "rm -rf '$out'" EXIT INT QUIT PIPE
|
|
|
|
# shellcheck disable=SC2046
|
|
- SYSTEMD_LOG_LEVEL=debug SYSTEMD_IN_INITRD=yes SYSTEMD_PROC_CMDLINE="fstab=no $(cat "$f")" $generator "$out" "$out" "$out"
|
|
+ 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"
|
|
+ fi
|
|
|
|
if [[ -f "$out"/systemd-fsck-root.service ]]; then
|
|
# For split-usr system
|
|
diff --git a/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-fs.target.requires/sysroot-usr.mount b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-fs.target.requires/sysroot-usr.mount
|
|
new file mode 100644
|
|
index 0000000000..e69de29bb2
|
|
diff --git a/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-root-device.target.d/50-root-device.conf b/test/test-fstab-generator/test-17-initrd-sysroot.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-17-initrd-sysroot.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-17-initrd-sysroot.fstab.expected/initrd-root-fs.target.requires/sysroot.mount b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-root-fs.target.requires/sysroot.mount
|
|
new file mode 100644
|
|
index 0000000000..e69de29bb2
|
|
diff --git a/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-usr-fs.target.requires/sysroot.mount b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-usr-fs.target.requires/sysroot.mount
|
|
new file mode 100644
|
|
index 0000000000..e69de29bb2
|
|
diff --git a/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-usr-fs.target.requires/sysusr-usr.mount b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/initrd-usr-fs.target.requires/sysusr-usr.mount
|
|
new file mode 100644
|
|
index 0000000000..e69de29bb2
|
|
diff --git a/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysroot-usr.mount b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysroot-usr.mount
|
|
new file mode 100644
|
|
index 0000000000..69be9c17d4
|
|
--- /dev/null
|
|
+++ b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysroot-usr.mount
|
|
@@ -0,0 +1,11 @@
|
|
+# Automatically generated by systemd-fstab-generator
|
|
+
|
|
+[Unit]
|
|
+Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
|
+SourcePath=/etc/fstab
|
|
+Before=initrd-fs.target
|
|
+
|
|
+[Mount]
|
|
+What=/sysusr/usr
|
|
+Where=/sysroot/usr
|
|
+Options=bind
|
|
diff --git a/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysroot.mount b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysroot.mount
|
|
new file mode 100644
|
|
index 0000000000..0e8a701be9
|
|
--- /dev/null
|
|
+++ b/test/test-fstab-generator/test-17-initrd-sysroot.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-17-initrd-sysroot.fstab.expected/systemd-fsck-root.service b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/systemd-fsck-root.service
|
|
new file mode 100644
|
|
index 0000000000..7f914fdd14
|
|
--- /dev/null
|
|
+++ b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/systemd-fsck-root.service
|
|
@@ -0,0 +1,16 @@
|
|
+# 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-17-initrd-sysroot.fstab.expected/sysusr-usr.mount b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysusr-usr.mount
|
|
new file mode 100644
|
|
index 0000000000..63fcb10340
|
|
--- /dev/null
|
|
+++ b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.expected/sysusr-usr.mount
|
|
@@ -0,0 +1,11 @@
|
|
+# Automatically generated by systemd-fstab-generator
|
|
+
|
|
+[Unit]
|
|
+Documentation=man:fstab(5) man:systemd-fstab-generator(8)
|
|
+SourcePath=/etc/fstab
|
|
+Before=initrd-usr-fs.target
|
|
+After=blockdev@dev-sdx2.target
|
|
+
|
|
+[Mount]
|
|
+What=/dev/sdx2
|
|
+Where=/sysusr/usr
|
|
diff --git a/test/test-fstab-generator/test-17-initrd-sysroot.fstab.input b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.input
|
|
new file mode 100644
|
|
index 0000000000..1ba9b0624e
|
|
--- /dev/null
|
|
+++ b/test/test-fstab-generator/test-17-initrd-sysroot.fstab.input
|
|
@@ -0,0 +1,2 @@
|
|
+/dev/sdx1 /sysroot auto defaults 0 1
|
|
+/dev/sdx2 /sysroot/usr auto defaults 0 0
|