summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2022-11-17 17:00:01 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2022-11-17 17:00:01 +0100
commit0dfb1f03118e05e340a8d20af76ebc0214193adf (patch)
tree4e6449b52f1712812be45cf3d274cf86b4d5083f
parent9d84f2c6a521a788bc3787520660f76316b940ac (diff)
downloadalpine-conf-0dfb1f03118e05e340a8d20af76ebc0214193adf.zip
update-kernel: add mkinitfs.conf to tests
-rwxr-xr-xtests/update_kernel_test2
-rw-r--r--update-kernel.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/update_kernel_test b/tests/update_kernel_test
index 08ccf2c..34c8116 100755
--- a/tests/update_kernel_test
+++ b/tests/update_kernel_test
@@ -39,6 +39,8 @@ update_kernel_flavor_body() {
update_kernel_firmware_body() {
atf_require_prog mksquashfs
init_env
+ mkdir -p etc/mkinitfs
+ touch etc/mkinitfs/mkinitfs.conf
mkdir out
MKSQUASHFS_OPTS="-info" atf_check -s exit:0 \
-o match:"apk add.*linux-firmware" \
diff --git a/update-kernel.in b/update-kernel.in
index 0847ece..263f47b 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -215,7 +215,7 @@ if [ "$SUPERUSER" ] && [ -z "$FAKEROOTKEY" ]; then
fi
if [ -z "$features" ]; then
- . /etc/mkinitfs/mkinitfs.conf
+ . "$ROOT"/etc/mkinitfs/mkinitfs.conf
fi
if [ -z "$FLAVOR" ]; then