summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-13 14:19:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-13 14:19:47 +0000
commitb6fb9a1754ec7c16567afeb414eda5dd0cc43bce (patch)
tree4e0ee076a4ae84ed6ec50bad0c1ba0a0e32d69ee
parent74b1eb7d7a36dd519fcb6cd9440a64315446b5f1 (diff)
downloaddrakx-b6fb9a1754ec7c16567afeb414eda5dd0cc43bce.tar
drakx-b6fb9a1754ec7c16567afeb414eda5dd0cc43bce.tar.gz
drakx-b6fb9a1754ec7c16567afeb414eda5dd0cc43bce.tar.bz2
drakx-b6fb9a1754ec7c16567afeb414eda5dd0cc43bce.tar.xz
drakx-b6fb9a1754ec7c16567afeb414eda5dd0cc43bce.zip
- fix cdrom-changedisk.img (didn't set correctly automatic=method:cdrom nor changedisk)
- have a valid .not-enough-room when failing building cdrom-changedisk.img
-rwxr-xr-xmake_boot_img5
1 files changed, 3 insertions, 2 deletions
diff --git a/make_boot_img b/make_boot_img
index ad8297ba0..385ce7627 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -177,7 +177,8 @@ sub initrd {
sub entries_append {
my ($type) = @_;
- my $automatic = $type eq "cdrom" ? 'automatic=method:cdrom' : '';
+ my $automatic = $type =~ /cdrom/ ? 'automatic=method:cdrom' : '';
+ $automatic .= " changedisk" if $type =~ /changedisk/;
my @simple_entries = (
linux => $default_vga,
@@ -249,7 +250,7 @@ F3 boot.msg
my ($name) = /(\S+)\.k?o$/ or die "bad file in .mar";
my $gz_size = chomp_(`gzip -c $dir/$_ | wc -c`);
sprintf "%7d %6d %s\n", $gz_size, listlength($pcitable =~ /"$name"/g), $name;
- } split(' ', `mdk-stage1/mar/mar -l $dir/${type}_modules.mar`);
+ } split(' ', `mdk-stage1/mar/mar -l $dir/${initrd_type}_modules.mar`);
output('.not-enough-room', "gz size - pcitable - name\n", @l);
warn sprintf("not enough room for $rdz: need %dKB (available %dKB < needed %dKB)\n", $s - $avail, $avail, $s);