From 19b2b2a27983792ef136d2b253b5263495a280cf Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 30 Oct 2023 01:02:33 +0100 Subject: [PATCH] test: follow-up to 2235fb83 Renamed .conf file for udev/mdev etc. caused 'mdev -df' to start in tests. This fix closes that again since none of that is needed in our small namespaced world. Signed-off-by: Joachim Wiberg --- test/setup-sysroot.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/setup-sysroot.sh b/test/setup-sysroot.sh index 1ead6341..c0fcdbdb 100755 --- a/test/setup-sysroot.sh +++ b/test/setup-sysroot.sh @@ -12,12 +12,12 @@ cp "$top_builddir/test/src/serv" "$SYSROOT/sbin/" FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$SYSROOT" make -f "$srcdir/lib/sysroot.mk" # Drop plugins we don't need in test, only causes confusing FAIL in logs. -for plugin in tty.so urandom.so rtc.so modprobe.so hotplug.so; do +for plugin in tty.so urandom.so rtc.so modprobe.so; do find "$SYSROOT" -name $plugin -delete done # Drop system .conf files we don't need in test, same as above -for conf in hotplug.conf; do +# shellcheck disable=SC2043 +for conf in 10-hotplug.conf; do find "$SYSROOT" -name $conf -delete done -