diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-09-19 14:53:59 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-09-19 14:53:59 +0000 |
| commit | 38bb20f8b0af585e6b01d9a23eee1fb5361f3d30 (patch) | |
| tree | 4d952303a3a562c26f8f6186f3520543269c0af8 | |
| parent | 9928adf3d60a964efa9b523009c55093f9458a13 (diff) | |
| download | draklive-38bb20f8b0af585e6b01d9a23eee1fb5361f3d30.tar draklive-38bb20f8b0af585e6b01d9a23eee1fb5361f3d30.tar.gz draklive-38bb20f8b0af585e6b01d9a23eee1fb5361f3d30.tar.bz2 draklive-38bb20f8b0af585e6b01d9a23eee1fb5361f3d30.tar.xz draklive-38bb20f8b0af585e6b01d9a23eee1fb5361f3d30.zip | |
copy additional modules after plain modules, so that they can overwrite them
| -rwxr-xr-x | draklive | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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"; |