pendent to 34d6ef3: [configs/releng] Remove i686 syslinux files

9 files changed, 10 insertions, 78 deletions

diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg
index d1817af..40d8b34 100644
--- a/configs/releng/syslinux/archiso.cfg
+++ b/configs/releng/syslinux/archiso.cfg
@@ -5,7 +5,7 @@ COM32 boot/syslinux/whichsys.c32
 APPEND -pxe- pxe -sys- sys -iso- sys
 
 LABEL pxe
-CONFIG boot/syslinux/archiso_pxe_choose.cfg
+CONFIG boot/syslinux/archiso_pxe.cfg
 
 LABEL sys
-CONFIG boot/syslinux/archiso_sys_choose.cfg
+CONFIG boot/syslinux/archiso_sys.cfg
diff --git a/configs/releng/syslinux/archiso_pxe32.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index d9e4956..b0e66e8 100644
--- a/configs/releng/syslinux/archiso_pxe32.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -1,3 +1,5 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+
 LABEL arch32_nbd
 TEXT HELP
 Boot the Arch Linux (i686) live medium (Using NBD).
@@ -30,3 +32,5 @@ LINUX boot/i686/vmlinuz
 INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
 SYSAPPEND 3
+
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_pxe64.cfg b/configs/releng/syslinux/archiso_pxe64.cfg
deleted file mode 100644
index 64d75f8..0000000
--- a/configs/releng/syslinux/archiso_pxe64.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-LABEL arch64_nbd
-TEXT HELP
-Boot the Arch Linux install medium using NBD.
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Arch Linux install medium (x86_64, NBD)
-LINUX boot/x86_64/vmlinuz
-INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
-SYSAPPEND 3
-
-LABEL arch64_nfs
-TEXT HELP
-Boot the Arch Linux live medium using NFS.
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Arch Linux install medium (x86_64, NFS)
-LINUX boot/x86_64/vmlinuz
-INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
-SYSAPPEND 3
-
-LABEL arch64_http
-TEXT HELP
-Boot the Arch Linux live medium using HTTP.
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Arch Linux install medium (x86_64, HTTP)
-LINUX boot/x86_64/vmlinuz
-INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
-SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_pxe_both_inc.cfg b/configs/releng/syslinux/archiso_pxe_both_inc.cfg
deleted file mode 100644
index 1593303..0000000
--- a/configs/releng/syslinux/archiso_pxe_both_inc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_pxe64.cfg
-INCLUDE boot/syslinux/archiso_pxe32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_pxe_choose.cfg b/configs/releng/syslinux/archiso_pxe_choose.cfg
deleted file mode 100644
index 6296065..0000000
--- a/configs/releng/syslinux/archiso_pxe_choose.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFAULT choose
-
-LABEL choose
-COM32 boot/syslinux/ifcpu64.c32
-APPEND have64 -- nohave64
-
-LABEL have64
-CONFIG boot/syslinux/archiso_pxe_both_inc.cfg
-
-LABEL nohave64
-CONFIG boot/syslinux/archiso_pxe_32_inc.cfg
diff --git a/configs/releng/syslinux/archiso_sys32.cfg b/configs/releng/syslinux/archiso_sys.cfg
index 603281e..62bba0b 100644
--- a/configs/releng/syslinux/archiso_sys32.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -1,3 +1,5 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+
 LABEL arch32
 TEXT HELP
 Boot the Arch Linux (i686) live medium.
@@ -7,3 +9,5 @@ MENU LABEL Boot Arch Linux (i686)
 LINUX boot/i686/vmlinuz
 INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
+
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys64.cfg b/configs/releng/syslinux/archiso_sys64.cfg
deleted file mode 100644
index c7685b5..0000000
--- a/configs/releng/syslinux/archiso_sys64.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDE boot/syslinux/archiso_head.cfg
-
-DEFAULT arch64
-TIMEOUT 30
-
-LABEL arch64
-TEXT HELP
-Boot the Arch Linux install medium on BIOS.
-It allows you to install Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Arch Linux install medium (x86_64, BIOS)
-LINUX boot/x86_64/vmlinuz
-INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/syslinux/archiso_sys_both_inc.cfg b/configs/releng/syslinux/archiso_sys_both_inc.cfg
deleted file mode 100644
index e885c40..0000000
--- a/configs/releng/syslinux/archiso_sys_both_inc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_sys64.cfg
-INCLUDE boot/syslinux/archiso_sys32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys_choose.cfg b/configs/releng/syslinux/archiso_sys_choose.cfg
deleted file mode 100644
index 24c597a..0000000
--- a/configs/releng/syslinux/archiso_sys_choose.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFAULT choose
-
-LABEL choose
-COM32 boot/syslinux/ifcpu64.c32
-APPEND have64 -- nohave64
-
-LABEL have64
-CONFIG boot/syslinux/archiso_sys_both_inc.cfg
-
-LABEL nohave64
-CONFIG boot/syslinux/archiso_sys_32_inc.cfg