Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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>
This commit is contained in:
Gerardo Exequiel Pozzi 2011-12-02 00:44:02 -03:00
parent 3df0be6a22
commit d7966acd15
19 changed files with 194 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configs/releng/syslinux.dual/archiso.cfg
View File

@ -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

4
configs/releng/syslinux.dual/archiso_both.cfg
View File

@ -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

6
configs/releng/syslinux.dual/archiso_head.cfg
View File

@ -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

43
configs/releng/syslinux.dual/archiso_pxe32.cfg Normal file
View File

@ -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

43
configs/releng/syslinux.dual/archiso_pxe64.cfg Normal file
View File

@ -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

2
configs/releng/syslinux.dual/archiso_32only.cfg → configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg
View File

@ -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

4
configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg Normal file
View File

@ -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

11
configs/releng/syslinux.dual/archiso_pxe_choose.cfg Normal file
View File

@ -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

1
configs/releng/syslinux.dual/archiso_arch32.cfg → configs/releng/syslinux.dual/archiso_sys32.cfg
View File

@ -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

1
configs/releng/syslinux.dual/archiso_arch64.cfg → configs/releng/syslinux.dual/archiso_sys64.cfg
View File

@ -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

3
configs/releng/syslinux.dual/archiso_sys_32_inc.cfg Normal file
View File

@ -0,0 +1,3 @@
INCLUDE boot/syslinux/archiso_head.cfg
INCLUDE boot/syslinux/archiso_sys32.cfg
INCLUDE boot/syslinux/archiso_tail.cfg

4
configs/releng/syslinux.dual/archiso_sys_both_inc.cfg Normal file
View File

@ -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

11
configs/releng/syslinux.dual/archiso_sys_choose.cfg Normal file
View File

@ -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

14
configs/releng/syslinux/archiso.cfg
View File

@ -1,3 +1,11 @@
INCLUDE boot/syslinux/archiso_head.cfg
INCLUDE boot/syslinux/archiso_arch.cfg
INCLUDE boot/syslinux/archiso_tail.cfg
DEFAULT select
LABEL select
COM32 boot/syslinux/whichsys.c32
APPEND -pxe- pxe -sys- sys -iso- sys
LABEL pxe
CONFIG boot/syslinux/archiso_pxe_inc.cfg
LABEL sys
CONFIG boot/syslinux/archiso_sys_inc.cfg

6
configs/releng/syslinux/archiso_head.cfg
View File

@ -5,10 +5,10 @@ MENU BACKGROUND boot/syslinux/splash.png
MENU WIDTH 78
MENU MARGIN 4
MENU ROWS 6
MENU ROWS 8
MENU VSHIFT 10
MENU TABMSGROW 11
MENU CMDLINEROW 11
MENU TABMSGROW 14
MENU CMDLINEROW 14
MENU HELPMSGROW 16
MENU HELPMSGENDROW 29

43
configs/releng/syslinux/archiso_pxe.cfg Normal file
View File

@ -0,0 +1,43 @@
LABEL arch_nbd
TEXT HELP
Boot the Arch Linux live medium (Using NBD). It allows you to install Arch Linux or
perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux (NBD)
LINUX boot/%ARCH%/vmlinuz
INITRD boot/%ARCH%/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
IPAPPEND 3
LABEL arch_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 Boot Arch Linux (NFS)
LINUX boot/%ARCH%/vmlinuz
INITRD boot/%ARCH%/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
IPAPPEND 3
LABEL arch_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 Boot Arch Linux (HTTP)
LINUX boot/%ARCH%/vmlinuz
INITRD boot/%ARCH%/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=http://${pxeserver}/
IPAPPEND 3
LABEL arch_ftp
TEXT HELP
Boot the Arch Linux live medium (Using FTP). It allows you to install Arch Linux or
perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux (FTP)
LINUX boot/%ARCH%/vmlinuz
INITRD boot/%ARCH%/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_curl_url=ftp://${pxeserver}/
IPAPPEND 3

3
configs/releng/syslinux/archiso_pxe_inc.cfg Normal file
View File

@ -0,0 +1,3 @@
INCLUDE boot/syslinux/archiso_head.cfg
INCLUDE boot/syslinux/archiso_pxe.cfg
INCLUDE boot/syslinux/archiso_tail.cfg

1
configs/releng/syslinux/archiso_sys.cfg
View File

@ -7,4 +7,3 @@ MENU LABEL Boot Arch Linux
LINUX boot/%ARCH%/vmlinuz
INITRD boot/%ARCH%/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
IPAPPEND 3

3
configs/releng/syslinux/archiso_sys_inc.cfg Normal file
View File

@ -0,0 +1,3 @@
INCLUDE boot/syslinux/archiso_head.cfg
INCLUDE boot/syslinux/archiso_sys.cfg
INCLUDE boot/syslinux/archiso_tail.cfg