summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorennael <ennael@mageia.org>2013-10-22 13:55:57 +0200
committerennael <ennael@mageia.org>2013-10-22 13:55:57 +0200
commit3d9d5474a03e21909dd47eb5ca5e0a66ee2da4a5 (patch)
tree4582b74c723b35219e3f31fddd0fee5a1c2286e6
parentb7cfccdd4130b0259ec193fb2cd58d6dd4ad5bc7 (diff)
downloaddrakx-3d9d5474a03e21909dd47eb5ca5e0a66ee2da4a5.tar
drakx-3d9d5474a03e21909dd47eb5ca5e0a66ee2da4a5.tar.gz
drakx-3d9d5474a03e21909dd47eb5ca5e0a66ee2da4a5.tar.bz2
drakx-3d9d5474a03e21909dd47eb5ca5e0a66ee2da4a5.tar.xz
drakx-3d9d5474a03e21909dd47eb5ca5e0a66ee2da4a5.zip
move isolinux in the root tree
-rwxr-xr-ximages/make_boot_img10
1 files changed, 5 insertions, 5 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index 45c1f26c8..91473d6a8 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -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/;
}