summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-29 23:25:52 +0000
committerColin Guthrie <colin@mageia.org>2013-10-29 23:26:05 +0000
commit3afd27c8728b52985ceb538512496990ade84197 (patch)
tree96ce59242754e9d1f85912441f37602514dcea0c
parentba8750f0f9f6c836bb5cf50a0a79cb0d645120b9 (diff)
downloaddrakx-3afd27c8728b52985ceb538512496990ade84197.tar
drakx-3afd27c8728b52985ceb538512496990ade84197.tar.gz
drakx-3afd27c8728b52985ceb538512496990ade84197.tar.bz2
drakx-3afd27c8728b52985ceb538512496990ade84197.tar.xz
drakx-3afd27c8728b52985ceb538512496990ade84197.zip
images: Fix isolinux.bin modules path and add needed modules
-rwxr-xr-ximages/make_boot_img20
1 files changed, 16 insertions, 4 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index b2dd793f6..21cb435a0 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -738,9 +738,15 @@ 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/ifcpu.c32 isolinux/ifcpu.c32";
+ _ "cp /usr/lib/syslinux/ldlinux.c32 isolinux/ldlinux.c32";
+ _ "cp /usr/lib/syslinux/libcom32.c32 isolinux/libcom32.c32";
+ _ "cp /usr/lib/syslinux/libgpl.c32 isolinux/libgpl.c32";
+ _ "cp /usr/lib/syslinux/libmenu.c32 isolinux/libmenu.c32";
+ _ "cp /usr/lib/syslinux/libutil.c32 isolinux/libutil.c32";
+ _ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32";
+ output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1));
xbox_stage1() if arch() =~ /i.86/;
}
@@ -771,7 +777,13 @@ sub boot_iso {
output('.boot_iso/VERSION', VERSION($kernels));
# for the boot iso, use standard isolinux
- _ "cp /usr/lib/syslinux/isolinux.bin .boot_iso/isolinux/isolinux.bin";
+ _ "cp $isolinux_bin .boot_iso/isolinux/isolinux.bin";
+ _ "cp /usr/lib/syslinux/ifcpu.c32 .boot_iso/isolinux/ifcpu.c32";
+ _ "cp /usr/lib/syslinux/ldlinux.c32 .boot_iso/isolinux/ldlinux.c32";
+ _ "cp /usr/lib/syslinux/libcom32.c32 .boot_iso/isolinux/libcom32.c32";
+ _ "cp /usr/lib/syslinux/libgpl.c32 .boot_iso/isolinux/libgpl.c32";
+ _ "cp /usr/lib/syslinux/libmenu.c32 .boot_iso/isolinux/libmenu.c32";
+ _ "cp /usr/lib/syslinux/libutil.c32 .boot_iso/isolinux/libutil.c32";
my $with_gfxboot = 0;
_ "cp /usr/share/gfxboot/themes/Mageia/install/* .boot_iso/isolinux" if $with_gfxboot;