[archiso] changes for syslinux 6

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>

10 files changed, 26 insertions, 21 deletions

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
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 6b13cb8..63b7126 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -108,10 +108,9 @@ make_syslinux() {
              s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}
     done
     cp ${script_path}/syslinux/splash.png ${work_dir}/iso/${install_dir}/boot/syslinux
-    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux
-    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/*.com ${work_dir}/iso/${install_dir}/boot/syslinux
-    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/*.0 ${work_dir}/iso/${install_dir}/boot/syslinux
-    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
     mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
     gzip -c -9 ${work_dir}/${arch}/root-image/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
     gzip -c -9 ${work_dir}/${arch}/root-image/usr/lib/modules/*-ARCH/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
@@ -121,8 +120,9 @@ make_syslinux() {
 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}/${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/bios/isolinux.bin ${work_dir}/iso/isolinux/
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/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_pxe32.cfg b/configs/releng/syslinux/archiso_pxe32.cfg
index 383094a..14f4aa3 100644
--- a/configs/releng/syslinux/archiso_pxe32.cfg
+++ b/configs/releng/syslinux/archiso_pxe32.cfg
@@ -7,7 +7,7 @@ MENU LABEL Boot Arch Linux (i686) (NBD)
 LINUX boot/i686/vmlinuz
 INITRD boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
-IPAPPEND 3
+SYSAPPEND 3
 
 LABEL arch32_nfs
 TEXT HELP
@@ -18,7 +18,7 @@ MENU LABEL Boot Arch Linux (i686) (NFS)
 LINUX boot/i686/vmlinuz
 INITRD boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
-IPAPPEND 3
+SYSAPPEND 3
 
 LABEL arch32_http
 TEXT HELP
@@ -29,4 +29,4 @@ MENU LABEL Boot Arch Linux (i686) (HTTP)
 LINUX boot/i686/vmlinuz
 INITRD boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
-IPAPPEND 3
+SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_pxe64.cfg b/configs/releng/syslinux/archiso_pxe64.cfg
index 6227393..a1cf975 100644
--- a/configs/releng/syslinux/archiso_pxe64.cfg
+++ b/configs/releng/syslinux/archiso_pxe64.cfg
@@ -7,7 +7,7 @@ MENU LABEL Boot Arch Linux (x86_64) (NBD)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
-IPAPPEND 3
+SYSAPPEND 3
 
 LABEL arch64_nfs
 TEXT HELP
@@ -18,7 +18,7 @@ MENU LABEL Boot Arch Linux (x86_64) (NFS)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
-IPAPPEND 3
+SYSAPPEND 3
 
 LABEL arch64_http
 TEXT HELP
@@ -29,4 +29,4 @@ MENU LABEL Boot Arch Linux (x86_64) (HTTP)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
-IPAPPEND 3
+SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg
index 5d95b3b..e85d8e1 100644
--- a/configs/releng/syslinux/archiso_tail.cfg
+++ b/configs/releng/syslinux/archiso_tail.cfg
@@ -24,4 +24,4 @@ COM32 boot/syslinux/reboot.c32
 
 LABEL poweroff
 MENU LABEL Power Off
-COMBOOT boot/syslinux/poweroff.com
+COM32 boot/syslinux/poweroff.c32
diff --git a/docs/README.altbootmethods b/docs/README.altbootmethods
index 3dc8a2c..574e658 100644
--- a/docs/README.altbootmethods
+++ b/docs/README.altbootmethods
@@ -81,7 +81,7 @@ Note: All NIC firmwares should support this.
           --enable-tftp \
           --tftp-root=/run/archiso/bootmnt \
           --dhcp-range=192.168.0.2,192.168.0.254,86400 \
-          --dhcp-boot=/arch/boot/syslinux/gpxelinux.0 \
+          --dhcp-boot=/arch/boot/syslinux/lpxelinux.0 \
           --dhcp-option-force=209,boot/syslinux/archiso.cfg \
           --dhcp-option-force=210,/arch/
 
@@ -92,7 +92,7 @@ Note: Not all NIC firmware supports HTTP and DNS (if domain name is used).
 
 # dnsmasq --port=0 \
           --dhcp-range=192.168.0.2,192.168.0.254,86400 \
-          --dhcp-boot=http://192.168.0.7/arch/boot/syslinux/gpxelinux.0 \
+          --dhcp-boot=http://192.168.0.7/arch/boot/syslinux/lpxelinux.0 \
           --dhcp-option-force=209,boot/syslinux/archiso.cfg \
           --dhcp-option-force=210,http://192.168.0.7/arch/
 
diff --git a/docs/README.bootparams b/docs/README.bootparams
index 8063bd1..755cc0d 100644
--- a/docs/README.bootparams
+++ b/docs/README.bootparams
@@ -68,11 +68,11 @@ INDEX
 ** hooks/archiso_pxe_common
 
 * ip=               This parameter is setup automatically by PXELINUX
-                    when option "IPAPPEND" is set to 1 or 2 in config.
+                    when option "SYSAPPEND" is set to 1 or 2 in config.
                     ip=<client-ip>:<boot-server-ip>:<gw-ip>:<netmask>
                     Default: (set via PXE server)
 * BOOTIF=           This parameter is setup automatically by PXELINUX
-                    when option "IPAPPEND" is set to 2 or 3 in config.
+                    when option "SYSAPPEND" is set to 2 or 3 in config.
                     BOOTIF=<hardware-address-of-boot-interface>
                     Default: (set via PXELINUX)
 * copy_resolvconf=  Copy /etc/resolv.conf from initramfs to live-enviroment.
diff --git a/docs/README.transfer b/docs/README.transfer
index c2883ad..ade083a 100644
--- a/docs/README.transfer
+++ b/docs/README.transfer
@@ -89,7 +89,7 @@ Note: COW is not supported on NTFS.
 # umount <MNT-TARGET-N>
 
 7) Install syslinux MBR boot code on target drive.
-# dd bs=440 count=1 conv=notrunc if=/usr/lib/syslinux/mbr.bin of=<DEV-TARGET>
+# dd bs=440 count=1 conv=notrunc if=/usr/lib/syslinux/bios/mbr.bin of=<DEV-TARGET>
 
 
 * PC-BIOS (ISOHYBRID-MBR):