65 lines
3.4 KiB
Diff
65 lines
3.4 KiB
Diff
|
From 054da791c98fba7e11079e94c9b9fe0b1ca4e8d4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||
|
|
Date: Fri, 4 Nov 2022 15:48:50 +0100
|
||
|
|
Subject: [PATCH] test: fstab-generator: adjust PATH for fsck
|
||
|
|
|
||
|
|
fsck(8) is located in /usr/sib/ on Debian sid:
|
||
|
|
|
||
|
|
stdout:
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-01-dev-nfs.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-02-dhcp.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-03-dhcp6.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-04-nfs.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-05-nfs4.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-06-ipv4.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-07-ipv6.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-08-implicit-nfs.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-09-cifs.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-10-iscsi.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-11-live.input
|
||
|
|
*** Running /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-12-dev-sdx.input
|
||
|
|
--- /dev/fd/63 2022-11-04 15:39:13.131532174 +0100
|
||
|
|
+++ /dev/fd/62 2022-11-04 15:39:13.131532174 +0100
|
||
|
|
@@ -6,3 +6,4 @@
|
||
|
|
initrd-usr-fs.target.requires
|
||
|
|
initrd-usr-fs.target.requires/sysroot.mount
|
||
|
|
sysroot.mount
|
||
|
|
+systemd-fsck-root.service
|
||
|
|
**** Unexpected output for /home/christian/Coding/workspaces/systemd/test/testdata/test-fstab-generator/test-12-dev-sdx.input
|
||
|
|
stderr:
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on NFS was requested.
|
||
|
|
Skipping root directory handling, as root on CIFS was requested.
|
||
|
|
Skipping root directory handling, as root on iSCSI was requested.
|
||
|
|
Skipping root directory handling, as root on live image was requested.
|
||
|
|
Found entry what=/dev/sdx1 where=/sysroot type=n/a opts=ro
|
||
|
|
Checking was requested for /dev/sdx1, but the fsck command does not exist.
|
||
|
|
|
||
|
|
(cherry picked from commit a45efc9e4b574a85176610496f2ac7ae769364bb)
|
||
|
|
|
||
|
|
Related #2138081
|
||
|
|
---
|
||
|
|
test/test-fstab-generator.sh | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/test/test-fstab-generator.sh b/test/test-fstab-generator.sh
|
||
|
|
index 0c977645e3..7c060dfac7 100755
|
||
|
|
--- a/test/test-fstab-generator.sh
|
||
|
|
+++ b/test/test-fstab-generator.sh
|
||
|
|
@@ -14,6 +14,9 @@ fi
|
||
|
|
|
||
|
|
src="$(dirname "$0")/testdata/test-fstab-generator"
|
||
|
|
|
||
|
|
+# fsck(8) is located in /usr/sbin on Debian
|
||
|
|
+PATH=$PATH:/usr/sbin
|
||
|
|
+
|
||
|
|
for f in "$src"/test-*.input; do
|
||
|
|
echo "*** Running $f"
|
||
|
|
|