diff options
| -rwxr-xr-x | images/make_boot_img | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/images/make_boot_img b/images/make_boot_img index 835b0e6f5..91473d6a8 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -237,10 +237,10 @@ sub syslinux_cfg_all { syslinux_cfg([ (map { - { kernel => 'alt0/vmlinuz', initrd => 'alt0/all.rdz', %$_ }; + { kernel => "$arch/vmlinuz", initrd => "$arch/all.rdz", %$_ }; } entries_append($type)), (map_index { - { label => "alt$::i", kernel => "alt$::i/vmlinuz", initrd => "alt$::i/all.rdz", + { label => "$arch", kernel => "$arch/vmlinuz", initrd => "$arch/all.rdz", append => join(' ', grep { $_ } $default_append, $default_acpi, $default_vga) }; } @kernels), { label => 'memtest', kernel => 'memtest' }, @@ -697,9 +697,9 @@ sub syslinux_all_files { each_index { mkdir "$dir/alt$::i", 0777; - _ "cp all.kernels/$_/vmlinuz $dir/alt$::i"; + _ "cp all.kernels/$_/vmlinuz $dir/$arch"; initrd('all', '', "images/all.rdz-$_"); - rename("images/all.rdz-$_", "$dir/alt$::i/all.rdz"); + rename("images/all.rdz-$_", "$dir/$arch/all.rdz"); } @$kernels; _ "install -m 644 -D /boot/memtest* $dir/memtest"; @@ -715,9 +715,9 @@ sub isolinux { syslinux_all_files('isolinux', $kernels); - _ "cp $isolinux_bin isolinux/isolinux.bin"; - _ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32"; - output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1)); + _ "cp $isolinux_bin ../isolinux/isolinux.bin"; + _ "cp /usr/lib/syslinux/gfxboot.c32 ../isolinux/gfxboot.c32"; + output("../isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1)); xbox_stage1() if arch() =~ /i.86/; } |