From b6fb9a1754ec7c16567afeb414eda5dd0cc43bce Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 13 May 2004 14:19:47 +0000 Subject: - 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 --- make_boot_img | 5 +++-- 1 file 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); -- cgit v1.2.1