summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-04-13 12:14:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-04-13 12:14:42 +0000
commitaae274fb51cf7d656b3c96d52acbc4c7aae7de5a (patch)
treee27f261f3cb895656136886dcadc3e3176443d81
parentc699dccae751655b20a63ebe1fac2a930f79d063 (diff)
downloaddrakx-aae274fb51cf7d656b3c96d52acbc4c7aae7de5a.tar
drakx-aae274fb51cf7d656b3c96d52acbc4c7aae7de5a.tar.gz
drakx-aae274fb51cf7d656b3c96d52acbc4c7aae7de5a.tar.bz2
drakx-aae274fb51cf7d656b3c96d52acbc4c7aae7de5a.tar.xz
drakx-aae274fb51cf7d656b3c96d52acbc4c7aae7de5a.zip
the right place to enumerate modules is list_modules.pm
-rw-r--r--kernel/list_modules.pm2
-rwxr-xr-xkernel/update_kernel3
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 2521e72fb..613b220d7 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -112,7 +112,7 @@ our %l = (
{
network => [ qw(af_packet nfs lockd sunrpc) ],
cdrom => [ qw(isofs) ],
- loopback => [ qw(isofs loop) ],
+ loopback => [ qw(isofs loop), if_($ENV{MOVE}, qw(cryptoloop gzloop supermount)) ],
local => [
if_(arch() =~ /^i.86|x86_64/, qw(vfat fat)),
if_(arch() =~ /^ppc/, qw(hfs)),
diff --git a/kernel/update_kernel b/kernel/update_kernel
index 772dd4a55..5da807e71 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -79,7 +79,6 @@ function create_modules_mar() {
for i in $images; do
eval "modules=\$${i}_modules_raw"
modules_with_deps=`perl -I $GIBASEDIR/kernel $GIBASEDIR/kernel/dependencies.pl $version modules.dep $modules`
- if [ -n "$MOVE" ]; then modules_with_deps="change_loop.o gzloop.o isofs.o zlib_inflate.o supermount.o $modules_with_deps"; fi
eval "create_marfile ${i}_modules.mar $modules_with_deps"
done
echo
@@ -164,7 +163,7 @@ for i in $ALL_KERNELS/*; do
done
cp -f all.modules/$main/modules.description .
-l=`perl modules.pl images` || exit 1
+l=`MOVE=$MOVE perl modules.pl images` || exit 1
eval $l
for i in $ALL_KERNELS/*; do