[arch-releng] [DRAFT] [PATCH] [archiso] changes for syslinux 5.

[Gerardo Exequiel Pozzi]

These are some initial changes, while testing syslinux 5.

Some things with 5.01:

* whichsys.c32 and ifcpu64.c32 seems to be broken so, you need to enter manually at "boot:" prompt the right label, ie: boot: sys, boot: have64. (reported to upstream)
* PXE seems to be broken, after loading gpxelinux.0, does not found UI or DEFAULT directive configuration. (need more research)
* comboot support was removed so, there is no more poweroff.com, and there is no poweroff.c32 module at this time.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 configs/baseline/build.sh                | 3 +++
 configs/baseline/isolinux/isolinux.cfg   | 1 +
 configs/releng/build.sh                  | 1 +
 configs/releng/isolinux/isolinux.cfg     | 1 +
 configs/releng/syslinux/archiso_tail.cfg | 4 ----
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index b8ad943..e080947 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -46,7 +46,9 @@ 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/ldlinux.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
     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/libutil.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
 }
 
 # Prepare /isolinux
@@ -55,6 +57,7 @@ make_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/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
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 26ef895..c2281c6 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -124,6 +124,7 @@ make_isolinux() {
     sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
     cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/isolinux.bin ${work_dir}/iso/isolinux/
     cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/isohdpfx.bin ${work_dir}/iso/isolinux/
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/ldlinux.c32 ${work_dir}/iso/isolinux/
 }
 
 # Prepare /EFI
diff --git a/configs/releng/isolinux/isolinux.cfg b/configs/releng/isolinux/isolinux.cfg
index 1040d3f..10fd285 100644
--- a/configs/releng/isolinux/isolinux.cfg
+++ b/configs/releng/isolinux/isolinux.cfg
@@ -1,3 +1,4 @@
+PATH /%INSTALL_DIR%/boot/syslinux/
 DEFAULT loadconfig
 
 LABEL loadconfig
diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg
index a55548c..fd58e10 100644
--- a/configs/releng/syslinux/archiso_tail.cfg
+++ b/configs/releng/syslinux/archiso_tail.cfg
@@ -21,7 +21,3 @@ APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pcii
 LABEL reboot
 MENU LABEL Reboot
 COM32 boot/syslinux/reboot.c32
-
-LABEL poweroff
-MENU LABEL Power Off
-COMBOOT boot/syslinux/poweroff.com
-- 
1.8.1.2