From 43c49bb918cafa114ad1862877a53894242dd868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 30 May 2023 22:53:43 +0200
Subject: [PATCH] test-fstab-generator: fix test on systemd with systemd-boot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(… or other boot loaders implementing the Boot Loader Interface.)

Fixes #27857.

(cherry picked from commit 088d8c99fe98e00eefdb8263cc9ce218a8023718)
(cherry picked from commit 3222272c46fc47c983df52063810e99c63c77439)
(cherry picked from commit a00581680eb331d8f8e32a1aaca5fb83b22f9bc9)
---
 test/test-fstab-generator.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/test-fstab-generator.sh b/test/test-fstab-generator.sh
index 7c060dfac7..5a166ab038 100755
--- a/test/test-fstab-generator.sh
+++ b/test/test-fstab-generator.sh
@@ -17,6 +17,10 @@ src="$(dirname "$0")/testdata/test-fstab-generator"
 # fsck(8) is located in /usr/sbin on Debian
 PATH=$PATH:/usr/sbin
 
+# systemd-pcrfs@.service could be enabled or not, depending on the host state
+# of the host system. Override the measurement to avoid the issue.
+export SYSTEMD_FORCE_MEASURE=0
+
 for f in "$src"/test-*.input; do
     echo "*** Running $f"