summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-01-10 16:50:12 +0000
committerOlivier Blin <oblin@mandriva.com>2008-01-10 16:50:12 +0000
commite3700d50428b8e132e17f9244b27113daa31020d (patch)
treeb6e32a46799cef951108545b23132945ce0f1c75
parentf5b53d708f65f4943bfd930749196a6c3b18a598 (diff)
downloaddraklive-e3700d50428b8e132e17f9244b27113daa31020d.tar
draklive-e3700d50428b8e132e17f9244b27113daa31020d.tar.gz
draklive-e3700d50428b8e132e17f9244b27113daa31020d.tar.bz2
draklive-e3700d50428b8e132e17f9244b27113daa31020d.tar.xz
draklive-e3700d50428b8e132e17f9244b27113daa31020d.zip
do not load twice additional modules if they were listed in extra modules
-rwxr-xr-xdraklive1
1 files changed, 1 insertions, 0 deletions
diff --git a/draklive b/draklive
index d926578..da9e6a2 100755
--- a/draklive
+++ b/draklive
@@ -494,6 +494,7 @@ sub create_initrd_for_media {
@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}) {
print STDERR "excluding modules: " . join(' ', @{$live->{system}{exclude_modules}}) . "\n";