keep a separate storage_modules variable

1 files changed, 7 insertions, 7 deletions

diff --git a/draklive b/draklive
index 040a56b..df311b1 100755
--- a/draklive
+++ b/draklive
@@ -460,7 +460,7 @@ sub create_initrd_for_media {
     my $kernel_root = "/lib/modules/" . $kernel;
     list_modules::load_dependencies(get_system_root($live) . $kernel_root . "/modules.dep");
 
-    my ($modules, $skipped) = partition { list_modules::modname2filename($_) }
+    my ($storage_modules, $skipped) = partition { list_modules::modname2filename($_) }
       uniq(map { modules::cond_mapping_24_26($_) } category2modules(get_media_setting($media, 'modules')));
     my ($extra_modules, $extra_missing) = partition { list_modules::modname2filename($_) }
       category2modules(get_media_setting($media, 'media_modules')),
@@ -474,14 +474,14 @@ sub create_initrd_for_media {
 
     my @missing = sort(difference2($extra_missing, \@additional_modules));
     @missing and die "missing mandatory modules:\n" . join("\n", @missing, '');
-    push @$modules, @$extra_modules;
 
     if ($live->{system}{exclude_modules}) {
         print STDERR "excluding modules: " . join(' ', @{$live->{system}{exclude_modules}}) . "\n";
-        @$modules = difference2($modules, $live->{system}{exclude_modules});
+        @$_ = difference2($_, $live->{system}{exclude_modules}) foreach $storage_modules, $extra_modules;
     }
 
-    my @module_deps = uniq(map { list_modules::dependencies_closure($_) } @$modules);
+    my @modules = (@$storage_modules, @$extra_modules);
+    my @module_deps = uniq(map { list_modules::dependencies_closure($_) } @modules);
     foreach my $m (@module_deps, @modules) {
         my $full = list_modules::modname2path($m);
         my $f = list_modules::modname2filename($m);
@@ -493,10 +493,10 @@ sub create_initrd_for_media {
 
     #- move ide-generic to end of loaded modules, so that it registers unhandled drives only
     #- this avoid it to take-over drives which would have been managed by SATA modules
-    my ($head, $tail) =  partition { $_ ne 'ide-generic' } @$modules;
-    @$modules = (@$head, @$tail);
+    my ($head, $tail) =  partition { $_ ne 'ide-generic' } @modules;
+    @modules = (@$head, @$tail);
 
-    create_initrd_scriptlet($live, $media, @module_deps, @$modules, @additional_modules);
+    create_initrd_scriptlet($live, $media, @module_deps, @modules, @additional_modules);
     compress_initrd_tree($live, $media);
     add_splash($live, $media);
 }