summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-07-11 13:48:54 +0000
committerOlivier Blin <oblin@mandriva.com>2008-07-11 13:48:54 +0000
commitaeaafb713d66a38f320ce31acbbfc966a4a941d7 (patch)
treee98de5186a6eab82c307e1f2b43c20e389d203c2
parent5d62cc78ee5daf99a37ac2d6da68ea6f24272442 (diff)
downloaddrakiso-aeaafb713d66a38f320ce31acbbfc966a4a941d7.tar
drakiso-aeaafb713d66a38f320ce31acbbfc966a4a941d7.tar.gz
drakiso-aeaafb713d66a38f320ce31acbbfc966a4a941d7.tar.bz2
drakiso-aeaafb713d66a38f320ce31acbbfc966a4a941d7.tar.xz
drakiso-aeaafb713d66a38f320ce31acbbfc966a4a941d7.zip
fix checking missing modules (do it after parsing additional modules)
-rwxr-xr-xdraklive6
1 files changed, 3 insertions, 3 deletions
diff --git a/draklive b/draklive
index db06204..91ba4f2 100755
--- a/draklive
+++ b/draklive
@@ -506,9 +506,6 @@ sub create_initrd_for_media {
(map { @{$loop{$_}{modules} || []} } uniq(map { $_->{type} } @{$live->{mount}{dirs} || []})),
($live->{mount}{overlay} ? @{$overlay{$live->{mount}{overlay}}{modules} || []} : ());
- my @missing = sort(difference2($extra_missing, \@additional_modules));
- @missing and die "missing mandatory modules:\n" . join("\n", @missing, '');
-
my @additional_modules = map { m!([^/]+)\.ko! } @{$live->{system}{additional_modules}};
@$extra_modules = difference2($extra_modules, \@additional_modules);
if (@{$live->{system}{exclude_modules} || []}) {
@@ -516,6 +513,9 @@ sub create_initrd_for_media {
@$_ = difference2($_, $live->{system}{exclude_modules}) foreach $storage_modules, $extra_modules;
}
+ my @missing = sort(difference2($extra_missing, \@additional_modules));
+ @missing and die "missing mandatory modules:\n" . join("\n", @missing, '');
+
mkdir_p($initrd_tree . $kernel_root . "/kernel");
my @modules = (@$storage_modules, @$extra_modules);
my @modules_closure = uniq(map { list_modules::dependencies_closure($_) } @modules);