diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-05 13:19:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-05 13:19:16 +0000 |
| commit | 68ad8c7c4540aabee78529e8c6b74d1eaf6e2142 (patch) | |
| tree | 2103c0c306535a8f2b484116fb09600c66b3fea9 /make_boot_img | |
| parent | 7a66448bcf0ac225c56e891202f98a6896dbac17 (diff) | |
| download | drakx-68ad8c7c4540aabee78529e8c6b74d1eaf6e2142.tar drakx-68ad8c7c4540aabee78529e8c6b74d1eaf6e2142.tar.gz drakx-68ad8c7c4540aabee78529e8c6b74d1eaf6e2142.tar.bz2 drakx-68ad8c7c4540aabee78529e8c6b74d1eaf6e2142.tar.xz drakx-68ad8c7c4540aabee78529e8c6b74d1eaf6e2142.zip | |
we don't use all_modules.mar any more for all.rdz, instead we simply copy modules from all_modules.list
Diffstat (limited to 'make_boot_img')
| -rwxr-xr-x | make_boot_img | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/make_boot_img b/make_boot_img index 7f77a5536..f612235c7 100755 --- a/make_boot_img +++ b/make_boot_img @@ -136,7 +136,7 @@ sub initrd { my $tar = "$instdir/stage1-data/stage1$o_raw_stage1_tree_kind.tar.bz2"; __ "$sudo umount $tmp $mnt 2>/dev/null"; - _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ ? ($type eq "all" ? 16386 : 16384) : ($type eq "all" ? 5000 : 2000)); + _ "dd if=/dev/zero of=$tmp bs=1k count=" . ($arch =~ /ia64/ || $type eq "all" ? 16384 : 2000); mke2fs($tmp); _ "$sudo mount -t ext2 $tmp $mnt -o loop"; @@ -168,7 +168,11 @@ sub initrd { } my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)"; my $modz = "kernel/all.modules$I/$ext"; - _ "$sudo cp -f $modz/${type}_modules.mar $mnt/modules/modules$I.mar"; + if ($type eq 'all') { + __ "cd $modz ; $sudo cp -f `cat ${type}_modules.list` $mnt/modules"; + } else { + _ "$sudo cp -f $modz/${type}_modules.mar $mnt/modules/modules$I.mar"; + } _ "$sudo cp -f $modz/modules.dep $mnt/modules/"; _ "$sudo cp -f /sbin/sash $mnt/tmp/sh" if $ENV{DEBUGSTAGE1}; _ "$sudo umount $mnt"; |