summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-ximages/make_boot_img19
1 files changed, 9 insertions, 10 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index c0cdf55f0..2e5dc428d 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -44,7 +44,7 @@ my @all_images = (
my @images = @ARGV ? @ARGV : map { "images/$_" } @all_images;
foreach my $img (@images) {
- my ($type, $I, $extension) = $img =~ m!([^/]*)(64)?\.([^.]*)$!;
+ my ($type, undef, $extension) = $img =~ m!([^/]*)(64)?\.([^.]*)$!;
if ($img =~ /hd_grub/) {
hd_grub($img);
@@ -57,10 +57,10 @@ foreach my $img (@images) {
} elsif ($img =~ /boot.iso/) {
boot_iso($img, \@kernels);
} elsif ($extension eq 'rdz') {
- initrd($type, $I, "$img-$_", $_) foreach @kernels;
+ initrd("$img-$_", $_) foreach @kernels;
} elsif ($extension eq 'img') {
print STDERR "calling boot_img_$arch for $img\n";
- $::{"boot_img_$arch"}->($type, $I, "$img-$_", $_, "all.kernels/$_/vmlinuz") foreach @kernels;
+ $::{"boot_img_$arch"}->($type, "$img-$_", $_, "all.kernels/$_/vmlinuz") foreach @kernels;
rename("$img-$kernels[0]", $img);
} else {
die "unknown image $img";
@@ -68,7 +68,7 @@ foreach my $img (@images) {
}
sub syslinux_color {
- "0" . {
+ "0" . {
default => '7',
blue => '9',
green => 'a',
@@ -143,7 +143,7 @@ sub trim {
}
sub initrd {
- my ($type, $I, $img, $kernel) = @_;
+ my ($img, $kernel) = @_;
my $stage1_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/stage1`) : "";
my $init_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/init`) : "";
my $modules = " mgainstaller ";
@@ -206,7 +206,7 @@ sub remove_ending_zero {
}
sub boot_img_i386 {
- my ($type, $I, $img, $kernel, $vmlinuz) = @_;
+ my ($type, $img, $kernel, $vmlinuz) = @_;
_ "rm -rf $tmp_mnt"; mkdir $tmp_mnt;
_ "cat $vmlinuz > $tmp_mnt/vmlinuz";
@@ -215,8 +215,7 @@ sub boot_img_i386 {
output("$tmp_mnt/advanced.msg", syslinux_msg('advanced.msg.xml'));
(my $rdz = $img) =~ s/\.img/.rdz/;
- (my $initrd_type = $type) =~ s/-changedisk//;
- initrd($initrd_type, $I, $rdz, $kernel);
+ initrd($rdz, $kernel);
my $short_type = substr($type, 0, 8);
output("$tmp_mnt/syslinux.cfg",
@@ -262,7 +261,7 @@ sub syslinux_all_files {
each_index {
mkdir "$dir/$arch", 0777;
_ "cp all.kernels/$_/vmlinuz $dir/$arch";
- initrd('all', '', "images/all.rdz-$_", $_);
+ initrd("images/all.rdz-$_", $_);
rename("images/all.rdz-$_", "$dir/$arch/all.rdz");
} @$kernels;
@@ -300,7 +299,7 @@ sub xbox_stage1() {
eval { rm_rf($dir) }; mkdir_p($dir);
_ "cp all.kernels/$xbox_kernel/vmlinuz $dir";
- initrd('all', '', "images/all.rdz-$xbox_kernel", $xbox_kernel);
+ initrd("images/all.rdz-$xbox_kernel", $xbox_kernel);
rename("images/all.rdz-$xbox_kernel", "$dir/initrd");
_ "cp /usr/share/cromwell/xromwell-installer.xbe $dir/default.xbe";