From bf7cf20e52d26132bf1f7c90c4c05f3dd5c79542 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 17 Nov 2005 13:38:17 +0000 Subject: have the same kernel for alt0 on both CD and all.img --- make_boot_img | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/make_boot_img b/make_boot_img index 0cdeb13bf..57b5b8be5 100755 --- a/make_boot_img +++ b/make_boot_img @@ -34,7 +34,8 @@ mkdir "images"; my $main = chomp_(cat_('kernel/RPMS/.main')); my $main_BOOT = chomp_(cat_('kernel/RPMS/.main-BOOT')); -my @kernels = grep { !/xbox/ } all('kernel/all.kernels'); +my @kernels = uniq($main, grep { !/xbox/ } all('kernel/all.kernels')); + my @kernels_BOOT = grep { /BOOT/ } @kernels; my @all_images = ( @@ -57,7 +58,7 @@ foreach my $img (@images) { if ($img =~ /hd_grub/) { hd_grub($img); } elsif ($img =~ /isolinux/) { - isolinux($main, @kernels); + isolinux(\@kernels); if (my ($tftpboot) = grep { -e $_ } qw(/tftpboot /var/lib/tftpboot)) { system("/bin/cp -f isolinux/alt0/* $tftpboot"); @@ -739,10 +740,9 @@ sub syslinux_all_files { } sub isolinux { - my ($main, @kernels) = @_; - @kernels = ($main, grep { $_ ne $main } @kernels); + my ($kernels) = @_; - syslinux_all_files('isolinux', \@kernels); + syslinux_all_files('isolinux', $kernels); _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin"; output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom')); -- cgit v1.2.1