diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-10-03 22:37:11 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-10-03 22:37:11 +0000 |
| commit | b44485c6469e43fb8b57a4ad20270ddb78cbaf55 (patch) | |
| tree | e013f20bd1d856eb551a5605a8622df2d0bfbf11 | |
| parent | 439aef41742fa759c26617f86718546dcb3a5957 (diff) | |
| download | draklive-b44485c6469e43fb8b57a4ad20270ddb78cbaf55.tar draklive-b44485c6469e43fb8b57a4ad20270ddb78cbaf55.tar.gz draklive-b44485c6469e43fb8b57a4ad20270ddb78cbaf55.tar.bz2 draklive-b44485c6469e43fb8b57a4ad20270ddb78cbaf55.tar.xz draklive-b44485c6469e43fb8b57a4ad20270ddb78cbaf55.zip | |
install modules in /modules instead of /lib in initrd
| -rwxr-xr-x | draklive | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -407,7 +407,7 @@ sub create_initrd_for_media { $lib_prefix or die "unable to find system libraries in /lib or /lib64\n"; mkdir_p($initrd_tree . $_) foreach - qw(/bin /dev /proc /sys), $lib_prefix, + qw(/bin /dev /modules /proc /sys), $lib_prefix, map { $live->{prefix}{live}{mnt} . $_ } $live->{prefix}{media}{mnt}, $live->{mount}{root}, @@ -494,10 +494,9 @@ sub create_initrd_for_media { } my @module_deps = uniq(map { moddeps_closure($_) } @$modules); - mkdir_p($initrd_tree . "/lib"); - run_program::run('gzip', '>', $initrd_tree . "/lib/$_.ko", '-dc', get_system_root($live) . $moddeps{$_}{full}) + run_program::run('gzip', '>', $initrd_tree . "/modules/$_.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/"); + cp_f((map { $live->{settings}{config_root} . '/' . $_ } @{$live->{system}{additional_modules}}), $initrd_tree . "/modules/"); @$skipped and print STDERR "skipped modules: " . join(' ', sort(@$skipped)) . "\n"; @@ -528,7 +527,7 @@ sub create_initrd_scriptlet { "mount -t proc none /proc", #- required for cdrom labels "mount -t sysfs none /sys", - (map { join(" ", "insmod", "/lib/$_.ko", grep { $_ } $live->{system}{module_options}{$_}) } @modules), + (map { join(" ", "insmod", "/modules/$_.ko", grep { $_ } $live->{system}{module_options}{$_}) } @modules), if_(member('usb-storage', @modules), #- wait some seconds for the usb-stor-scan process to be run "sleep 2", |