From 38bb20f8b0af585e6b01d9a23eee1fb5361f3d30 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 19 Sep 2007 14:53:59 +0000 Subject: copy additional modules after plain modules, so that they can overwrite them --- draklive | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/draklive b/draklive index 22eb0d8..f330709 100755 --- a/draklive +++ b/draklive @@ -483,7 +483,6 @@ sub create_initrd_for_media { ($live->{mount}{overlay} ? @{$overlay{$live->{mount}{overlay}}{modules} || []} : ()); my @additional_modules = map { m!([^/]+)\.ko! } @{$live->{system}{additional_modules}}; - cp_f((map { $live->{settings}{config_root} . '/' . $_ } @{$live->{system}{additional_modules}}), $initrd_tree . "/lib/"); my @missing = sort(difference2($extra_missing, \@additional_modules)); @missing and die "missing mandatory modules:\n" . join("\n", @missing); @@ -498,6 +497,7 @@ sub create_initrd_for_media { mkdir_p($initrd_tree . "/lib"); run_program::run('gzip', '>', $initrd_tree . "/lib/$_.ko", '-dc', get_system_root($live) . $moddeps{$_}{full}) foreach @module_deps, @$modules; + cp_f((map { $live->{settings}{config_root} . '/' . $_ } @{$live->{system}{additional_modules}}), $initrd_tree . "/lib/"); @$skipped and print STDERR "skipped modules: " . join(' ', sort(@$skipped)) . "\n"; -- cgit v1.2.1