From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 30 Apr 2024 06:43:16 +0000 (+0200)
Subject: TEST-81-GENERATORS: Use SYSTEMD_PROC_CMDLINE more
X-Git-Tag: v256-rc2~156^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ce32f2f5f896466dd131fe392583687f17564b7;p=thirdparty%2Fsystemd.git

TEST-81-GENERATORS: Use SYSTEMD_PROC_CMDLINE more

Makes the test more robust as the command line the image is booted
won't influence the test result.
---

diff --git a/test/units/testsuite-81.fstab-generator.sh b/test/units/testsuite-81.fstab-generator.sh
index e50419a0ecc..0c1b27eb1de 100755
--- a/test/units/testsuite-81.fstab-generator.sh
+++ b/test/units/testsuite-81.fstab-generator.sh
@@ -295,12 +295,6 @@ check_fstab_mount_units() {
     done
 }
 
-# Drop usrhash on the command-line so fstab-generator doesn't add a /dev/mapper
-# mount for /usr, add a root= to emulate a more typical environment,
-# and remove any systemd.mount-extra=
-sed -r -e 's/usrhash=[^[:space:]+]/root=\/dev\/sda2/' -e 's/systemd.mount-extra=[^[:space:]+]//g' /proc/cmdline >/tmp/cmdline.tmp
-mount --bind /tmp/cmdline.tmp /proc/cmdline
-
 : "fstab-generator: regular"
 printf "%s\n" "${FSTAB_GENERAL_ROOT[@]}" >"$FSTAB"
 cat "$FSTAB"
@@ -332,7 +326,7 @@ SYSTEMD_IN_INITRD=1 SYSTEMD_FSTAB=/dev/null SYSTEMD_SYSROOT_FSTAB="$FSTAB" check
 
 # Check the default stuff that we (almost) always create in initrd
 : "fstab-generator: initrd default"
-SYSTEMD_IN_INITRD=1 SYSTEMD_FSTAB=/dev/null SYSTEMD_SYSROOT_FSTAB=/dev/null run_and_list "$GENERATOR_BIN" "$OUT_DIR"
+SYSTEMD_PROC_CMDLINE="root=/dev/sda2" SYSTEMD_IN_INITRD=1 SYSTEMD_FSTAB=/dev/null SYSTEMD_SYSROOT_FSTAB=/dev/null run_and_list "$GENERATOR_BIN" "$OUT_DIR"
 test -e "$OUT_DIR/normal/sysroot.mount"
 test -e "$OUT_DIR/normal/systemd-fsck-root.service"
 link_eq "$OUT_DIR/normal/initrd-root-fs.target.requires/sysroot.mount" "../sysroot.mount"
@@ -354,7 +348,7 @@ cat "$FSTAB"
 printf "%s\n" "${FSTAB_INVALID[@]}" >"$FSTAB"
 cat "$FSTAB"
 # Don't care about the exit code here
-SYSTEMD_FSTAB="$FSTAB" run_and_list "$GENERATOR_BIN" "$OUT_DIR" || :
+SYSTEMD_PROC_CMDLINE="" SYSTEMD_FSTAB="$FSTAB" run_and_list "$GENERATOR_BIN" "$OUT_DIR" || :
 # No mounts should get created here
 [[ "$(find "$OUT_DIR" -name "*.mount" | wc -l)" -eq 0 ]]