From c73a8cdf05d5b84225884573b546c123667de991 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 12 Feb 2009 07:30:02 +0000
Subject: [PATCH] alpine.mk/initram: name modloop after kernel flavor
So we can support multiple kernels in parallel.
---
alpine.mk | 2 +-
initramfs-init | 15 +++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/alpine.mk b/alpine.mk
index 3395257c8eb0..4d0f7e2d8259 100755
--- a/alpine.mk
+++ b/alpine.mk
@@ -89,7 +89,7 @@ $(REPOS_DIRSTAMP): $(SOURCE_APKBUILDS)
#
modloop: $(MODLOOP)
-MODLOOP := $(ISO_DIR)/boot/modloop.cmg
+MODLOOP := $(ISO_DIR)/boot/$(KERNEL_NAME).cmg
MODLOOP_DIR := $(DESTDIR)/modloop
MODLOOP_DIRSTAMP := $(DESTDIR)/stamp.modloop
diff --git a/initramfs-init b/initramfs-init
index b14477d54c4e..b2375fece3b3 100755
--- a/initramfs-init
+++ b/initramfs-init
@@ -113,17 +113,20 @@ mount $ALPINE_MNT >/dev/null 2>&1
eend $?
ebegin "Mounting loopback device for kernel modules"
modprobe loop
-mount -o loop,ro -t cramfs /media/$ALPINE_DEV/$(dirname ${KOPT_BOOT_IMAGE:-""})/modloop.cmg /.modloop
+mount -o loop,ro -t cramfs $ALPINE_MNT/$KOPT_BOOT_IMAGE.cmg /.modloop
rc=$?
if [ "$rc" = 0 ]; then
rm -rf /lib/modules
ln -sf /.modloop/modules /lib
fi
+eend $?
+
if [ -d $ALPINE_MNT/firmware ]; then
- mkdir -p /lib/firmware
- cp -a $ALPINE_MNT/firmware/* /lib/firmware/
+ ebegin "Copying firmware from $ALPINE_MNT/firmware"
+ mkdir -p /lib
+ cp -R -a $ALPINE_MNT/firmware /lib/
+ eend $?
fi
-eend $?
# early console?
if [ "$SINGLEMODE" = "yes" ]; then
@@ -157,14 +160,14 @@ fi
# install new root
ebegin "Installing packages to root filesystem"
mkdir -p /etc/apk
-for i in /media/$ALPINE_DEV/packages/*; do
+for i in $ALPINE_MNT/packages/*; do
echo $i >> /etc/apk/repositories
done
apk add --root /newroot --initdb --quiet --progress $pkgs
eend $?
# copy alpine release info
-cp /media/$ALPINE_DEV/.alpine-release $NEWROOT/
+cp $ALPINE_MNT/.alpine-release $NEWROOT/
ln -sf /.alpine-release $NEWROOT/etc/alpine-release
# if there is no repositories file, then use the default
--
GitLab