diff options
| author | Scott James Remnant <scott@ubuntu.com> | 2009-12-16 17:47:49 +0000 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2010-03-24 02:53:30 +0100 |
| commit | 1d3037b49b68ed615fb60d8f2a3c0e7e78c857d0 (patch) | |
| tree | 746db3b138c1b5b0030288344b88b7243dc6124c | |
| parent | 61375f9d9a76a0771b00a32412b7afd296551454 (diff) | |
| download | initramfs-tools-1d3037b49b68ed615fb60d8f2a3c0e7e78c857d0.tar.gz initramfs-tools-1d3037b49b68ed615fb60d8f2a3c0e7e78c857d0.zip | |
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>
| -rwxr-xr-x | init | 1 | ||||
| -rwxr-xr-x | mkinitramfs | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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" / |