[configs/releng] Use whichsys.c32 to determine bootloader type

* In that way we can have two differents syslinux menus depending if booting from
PXE or from non-PXE.
Some file renames are made to keep things ordered:

archiso_pxe* all things related to PXELINUX
archiso_sys* all things related to SYSLINUX
*_inc.cfg only contains INCLUDE directive

* By default NBD PXE option is selected for booting on timeout.
* As (NDB/NFS/HTTP/FTP) server is used the same IP from pxeserver.

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

13 files changed, 131 insertions, 19 deletions

diff --git a/configs/releng/syslinux.dual/archiso.cfg b/configs/releng/syslinux.dual/archiso.cfg
index 9994e43..d1817af 100644
--- a/configs/releng/syslinux.dual/archiso.cfg
+++ b/configs/releng/syslinux.dual/archiso.cfg
@@ -1,12 +1,11 @@
-DEFAULT choose
-PROMPT 0
+DEFAULT select
 
-LABEL choose
-KERNEL boot/syslinux/ifcpu64.c32
-APPEND have64 -- nohave64
+LABEL select
+COM32 boot/syslinux/whichsys.c32
+APPEND -pxe- pxe -sys- sys -iso- sys
 
-LABEL have64
-CONFIG boot/syslinux/archiso_both.cfg
+LABEL pxe
+CONFIG boot/syslinux/archiso_pxe_choose.cfg
 
-LABEL nohave64
-CONFIG boot/syslinux/archiso_32only.cfg
+LABEL sys
+CONFIG boot/syslinux/archiso_sys_choose.cfg
diff --git a/configs/releng/syslinux.dual/archiso_both.cfg b/configs/releng/syslinux.dual/archiso_both.cfg
deleted file mode 100644
index 493ee81..0000000
--- a/configs/releng/syslinux.dual/archiso_both.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_arch32.cfg
-INCLUDE boot/syslinux/archiso_arch64.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_head.cfg b/configs/releng/syslinux.dual/archiso_head.cfg
index 91d6e21..6514c42 100644
--- a/configs/releng/syslinux.dual/archiso_head.cfg
+++ b/configs/releng/syslinux.dual/archiso_head.cfg
@@ -5,10 +5,10 @@ MENU BACKGROUND boot/syslinux/splash.png
 
 MENU WIDTH 78
 MENU MARGIN 4
-MENU ROWS 7
+MENU ROWS 8
 MENU VSHIFT 10
-MENU TABMSGROW 11
-MENU CMDLINEROW 11
+MENU TABMSGROW 14
+MENU CMDLINEROW 14
 MENU HELPMSGROW 16
 MENU HELPMSGENDROW 29
 
diff --git a/configs/releng/syslinux.dual/archiso_pxe32.cfg b/configs/releng/syslinux.dual/archiso_pxe32.cfg
new file mode 100644
index 0000000..56820d9
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe32.cfg
@@ -0,0 +1,43 @@
+LABEL arch32_nbd
+TEXT HELP
+Boot the Arch Linux (i686) live medium (Using NBD). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+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
+
+LABEL arch32_nfs
+TEXT HELP
+Boot the Arch Linux (i686) live medium (Using NFS). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+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
+
+LABEL arch32_http
+TEXT HELP
+Boot the Arch Linux (i686) live medium (Using HTTP). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Arch Linux (i686) (HTTP)
+LINUX boot/i686/vmlinuz
+INITRD boot/i686/archiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=http://${pxeserver}/
+IPAPPEND 3
+
+LABEL arch32_ftp
+TEXT HELP
+Boot the Arch Linux (i686) live medium (Using FTP). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Arch Linux (i686) (FTP)
+LINUX boot/i686/vmlinuz
+INITRD boot/i686/archiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=ftp://${pxeserver}/
+IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/archiso_pxe64.cfg b/configs/releng/syslinux.dual/archiso_pxe64.cfg
new file mode 100644
index 0000000..762fbc1
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe64.cfg
@@ -0,0 +1,43 @@
+LABEL arch64_nbd
+TEXT HELP
+Boot the Arch Linux (x86_64) live medium (Using NBD). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+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
+
+LABEL arch64_nfs
+TEXT HELP
+Boot the Arch Linux (x86_64) live medium (Using NFS). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+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
+
+LABEL arch64_http
+TEXT HELP
+Boot the Arch Linux (x86_64) live medium (Using HTTP). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Arch Linux (x86_64) (HTTP)
+LINUX boot/x86_64/vmlinuz
+INITRD boot/x86_64/archiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=http://${pxeserver}/
+IPAPPEND 3
+
+LABEL arch64_ftp
+TEXT HELP
+Boot the Arch Linux (x86_64) live medium (Using FTP). It allows you to install Arch Linux or
+perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Arch Linux (x86_64) (FTP)
+LINUX boot/x86_64/vmlinuz
+INITRD boot/x86_64/archiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=ftp://${pxeserver}/
+IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/archiso_32only.cfg b/configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg
index e0cad88..e4115df 100644
--- a/configs/releng/syslinux.dual/archiso_32only.cfg
+++ b/configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg
@@ -1,3 +1,3 @@
 INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_arch32.cfg
+INCLUDE boot/syslinux/archiso_pxe32.cfg
 INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg
new file mode 100644
index 0000000..324523e
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg
@@ -0,0 +1,4 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_pxe32.cfg
+INCLUDE boot/syslinux/archiso_pxe64.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_pxe_choose.cfg b/configs/releng/syslinux.dual/archiso_pxe_choose.cfg
new file mode 100644
index 0000000..6296065
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe_choose.cfg
@@ -0,0 +1,11 @@
+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.dual/archiso_arch32.cfg b/configs/releng/syslinux.dual/archiso_sys32.cfg
index e7c7e23..261579e 100644
--- a/configs/releng/syslinux.dual/archiso_arch32.cfg
+++ b/configs/releng/syslinux.dual/archiso_sys32.cfg
@@ -7,4 +7,3 @@ MENU LABEL Boot Arch Linux (i686)
 LINUX boot/i686/vmlinuz
 INITRD boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/archiso_arch64.cfg b/configs/releng/syslinux.dual/archiso_sys64.cfg
index aee7bb0..eb89813 100644
--- a/configs/releng/syslinux.dual/archiso_arch64.cfg
+++ b/configs/releng/syslinux.dual/archiso_sys64.cfg
@@ -7,4 +7,3 @@ MENU LABEL Boot Arch Linux (x86_64)
 LINUX boot/x86_64/vmlinuz
 INITRD boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/archiso_sys_32_inc.cfg b/configs/releng/syslinux.dual/archiso_sys_32_inc.cfg
new file mode 100644
index 0000000..9e37093
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys_32_inc.cfg
@@ -0,0 +1,3 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_sys32.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg
new file mode 100644
index 0000000..4ed6b39
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg
@@ -0,0 +1,4 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_sys32.cfg
+INCLUDE boot/syslinux/archiso_sys64.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_sys_choose.cfg b/configs/releng/syslinux.dual/archiso_sys_choose.cfg
new file mode 100644
index 0000000..24c597a
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys_choose.cfg
@@ -0,0 +1,11 @@
+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