[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#659866: [PATCH] mkinitramfs: Copy modules.builtin into initramfs



Like modules.order, this file is only generated at kernel build time.

Closes: #659866
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 mkinitramfs |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mkinitramfs b/mkinitramfs
index 039eb81..bb8880f 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -197,11 +197,12 @@ for d in bin conf/conf.d etc lib/modules run sbin scripts ${MODULESDIR}; do
 	mkdir -p "${DESTDIR}/${d}"
 done
 
-# Copy the modules.order file in
-if [ -f "${MODULESDIR}/modules.order" ]; then
-	cp -p "${MODULESDIR}/modules.order" \
-		"${DESTDIR}${MODULESDIR}/modules.order"
-fi
+# Copy in modules.builtin and modules.order (not generated by depmod)
+for x in modules.builtin modules.order; do
+	if [ -f "${MODULESDIR}/${x}" ]; then
+		cp -p "${MODULESDIR}/${x}" "${DESTDIR}${MODULESDIR}/${x}"
+	fi
+done
 
 # MODULES=list case.  Always honour.
 for x in "${CONFDIR}/modules" /usr/share/initramfs-tools/modules.d/*; do
-- 
1.7.9


Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: