From 6d4e69b90527c1be56c50f6d8a32cf6540ef361a Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 19 Oct 2013 15:02:35 -0300 Subject: [archiso] changes for syslinux 6 Signed-off-by: Gerardo Exequiel Pozzi --- configs/baseline/build.sh | 9 ++++++--- configs/baseline/isolinux/isolinux.cfg | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'configs/baseline') diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index b8ad943..ed65e17 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -46,15 +46,18 @@ make_syslinux() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g; s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg - cp ${work_dir}/root-image/usr/lib/syslinux/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ + cp ${work_dir}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ + cp ${work_dir}/root-image/usr/lib/syslinux/bios/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ + cp ${work_dir}/root-image/usr/lib/syslinux/bios/libutil.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/ } # Prepare /isolinux make_isolinux() { mkdir -p ${work_dir}/iso/isolinux sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg - cp ${work_dir}/root-image/usr/lib/syslinux/isolinux.bin ${work_dir}/iso/isolinux/ - cp ${work_dir}/root-image/usr/lib/syslinux/isohdpfx.bin ${work_dir}/iso/isolinux/ + cp ${work_dir}/root-image/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ + cp ${work_dir}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ + cp ${work_dir}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/ } # Process aitab diff --git a/configs/baseline/isolinux/isolinux.cfg b/configs/baseline/isolinux/isolinux.cfg index 44b5684..33e8b65 100644 --- a/configs/baseline/isolinux/isolinux.cfg +++ b/configs/baseline/isolinux/isolinux.cfg @@ -1,3 +1,4 @@ +PATH /%INSTALL_DIR%/boot/syslinux/ DEFAULT loadconfig LABEL loadconfig -- cgit v1.2.3-54-g00ecf