From 1d3037b49b68ed615fb60d8f2a3c0e7e78c857d0 Mon Sep 17 00:00:00 2001
From: Scott James Remnant <scott@ubuntu.com>
Date: Wed, 16 Dec 2009 17:47:49 +0000
Subject: mkinitramfs: Call depmod before packing the initramfs.

init: thus drop depmod call.

Don't quote modules.*map, so we actually expand it.

(closes: #465760, #562561)

[ merge from 0.92bubuntu57 and 0.92bubuntu58 ]
Signed-off-by: maximilian attems <maks@debian.org>
---
 init        | 1 -
 mkinitramfs | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/init b/init
index 68ceac7..05853b4 100755
--- a/init
+++ b/init
@@ -177,7 +177,6 @@ if [ -n "${noresume}" ]; then
 	unset resume
 fi
 
-depmod -a
 maybe_break top
 
 # Don't do log messages here to avoid confusing usplash
diff --git a/mkinitramfs b/mkinitramfs
index 30a19d1..58082cf 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -247,6 +247,10 @@ fi
 run_scripts /usr/share/initramfs-tools/hooks
 run_scripts "${CONFDIR}"/hooks
 
+# generate module deps
+depmod -a -b "${DESTDIR}" ${version}
+rm "${DESTDIR}/lib/modules/${version}"/modules.*map
+
 # Apply DSDT to initramfs
 if [ -e "${CONFDIR}/DSDT.aml" ]; then
 	copy_exec "${CONFDIR}/DSDT.aml" /
-- 
cgit v1.2.3