diff options
| -rwxr-xr-x | make_boot_img | 9 | ||||
| -rwxr-xr-x | rescue/make_rescue_img | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/make_boot_img b/make_boot_img index cd9c0fd6d..25a9c8c52 100755 --- a/make_boot_img +++ b/make_boot_img @@ -37,12 +37,13 @@ _ "$sudo mkdir -p $tmp_mnt $tmp_mnt_initrd"; mkdir "images"; chomp(my $main = `cat kernel/all.kernels/.main`); -my @kernels = grep { /^2/ } all('kernel/all.kernels'); +chomp(my $main_isolinux = (cat_('kernel/all.kernels/.isolinux'))[0]); +my @kernels = grep { /^2/ && $_ !~ /^$main_isolinux$/ } all('kernel/all.kernels'); +$main_isolinux ||= $main; my @all_images = ( - if_($arch =~ /i.86/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img', 'network.img', 'network_drivers.img'), #, 'ka.img'), - if_($arch =~ /x86_64/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'network.img', 'network_drivers.img'), + if_($arch =~ /i.86|x86_64/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img', 'network.img', 'network_drivers.img'), #, 'ka.img'), if_($arch =~ /ia64/, 'all.img'), ); @@ -60,7 +61,7 @@ foreach my $img (@images) { if ($img =~ /hd_grub/) { hd_grub($tmp_mnt, $img); } elsif ($img =~ /isolinux/) { - isolinux($main, @kernels); + isolinux($main_isolinux, @kernels); if (my ($tftpboot) = grep { -e $_ } qw(/tftpboot /var/lib/tftpboot)) { system("/bin/cp -f isolinux/alt0/* $tftpboot"); diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index 8afbb4d4e..ad3aab571 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -87,7 +87,9 @@ foreach (cat_("aliases")) { -e "../kernel/all.modules" or die "use ./update_kernel in gi/kernel first\n"; -chomp($main = `cat ../kernel/all.kernels/.main`); +chomp(my $main_standard = `cat ../kernel/all.kernels/.main`); +chomp(my $main_isolinux = (cat_('../kernel/all.kernels/.isolinux'))[0]); +my $main = $main_isolinux or $main_standard; _ "cp ../kernel/all.modules/modules.cz-$main $tmp/modules/modules.cz"; _ "cp ../kernel/all.modules/$main/modules.dep $tmp/modules"; |