2024-10-31 20:03:00 +00:00
|
|
|
From 02bc9391cfdf7f3b16c49cde9d881642c13fc8c0 Mon Sep 17 00:00:00 2001
|
2024-07-22 17:47:47 +00:00
|
|
|
From: Laszlo Gombos <laszlo.gombos@gmail.com>
|
|
|
|
|
Date: Sat, 20 Jul 2024 18:49:38 -0400
|
2024-10-31 20:03:00 +00:00
|
|
|
Subject: [PATCH 07/32] test: do not force include dash, let sh module make a
|
2024-07-22 17:47:47 +00:00
|
|
|
selection
|
|
|
|
|
|
|
|
|
|
This is important for alpine, so that it does not install both
|
|
|
|
|
dash and busybox dracut modules that are potentially conflicting.
|
|
|
|
|
|
|
|
|
|
(cherry picked from commit 6e3c2bf9d01ad0f93176ee121bb70404f24de4e7)
|
|
|
|
|
---
|
|
|
|
|
modules.d/80test-makeroot/module-setup.sh | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/modules.d/80test-makeroot/module-setup.sh b/modules.d/80test-makeroot/module-setup.sh
|
|
|
|
|
index f311e4a0..fc105d7e 100755
|
|
|
|
|
--- a/modules.d/80test-makeroot/module-setup.sh
|
|
|
|
|
+++ b/modules.d/80test-makeroot/module-setup.sh
|
|
|
|
|
@@ -6,7 +6,7 @@ check() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
depends() {
|
|
|
|
|
- echo "dash rootfs-block kernel-modules qemu"
|
|
|
|
|
+ echo "rootfs-block kernel-modules qemu"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
installkernel() {
|
|
|
|
|
--
|
|
|
|
|
2.42.0
|
|
|
|
|
|
