gentoo-overlay/sys-apps/systemd/files/0006-test-PATH-sbin-so-fsta...

34 lines
1.1 KiB
Diff
Raw Permalink Normal View History

From 8c528bcfd198d318fc25b4e75874e74449c2f020 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 18 Aug 2024 02:26:39 -0500
Subject: [PATCH 06/34] test: $PATH += /sbin so fstab-generator finds fsck
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Our fsck is in /sbin, not /usr/sbin. (Likely, Debian's was in /sbin
before the ill-advised usr-merge, too.)
This cannot be upstreamed.
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
---
test/test-fstab-generator.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/test-fstab-generator.sh b/test/test-fstab-generator.sh
index 476312133e43..c265c60e03d6 100755
--- a/test/test-fstab-generator.sh
+++ b/test/test-fstab-generator.sh
@@ -17,7 +17,7 @@ fi
src="$(dirname "$0")/testdata/test-fstab-generator"
# fsck(8) is located in /usr/sbin on Debian
-PATH=$PATH:/usr/sbin
+PATH=$PATH:/usr/sbin:/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.
--
2.41.0