[arch-releng] [PATCH 1/4] [configs/releng] Split syslinux cfgs in single arch, like in dual arch
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/releng/syslinux/archiso.cfg | 72 +---------------------------- configs/releng/syslinux/archiso_head.cfg | 28 ++++++++++++ configs/releng/syslinux/archiso_sys.cfg | 10 ++++ configs/releng/syslinux/archiso_tail.cfg | 29 ++++++++++++ 4 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 configs/releng/syslinux/archiso_head.cfg create mode 100644 configs/releng/syslinux/archiso_sys.cfg create mode 100644 configs/releng/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg index e508bcc..1228355 100644 --- a/configs/releng/syslinux/archiso.cfg +++ b/configs/releng/syslinux/archiso.cfg @@ -1,69 +1,3 @@ -SERIAL 0 38400 -DEFAULT boot/syslinux/vesamenu.c32 -PROMPT 0 -MENU TITLE Arch Linux -MENU BACKGROUND boot/syslinux/splash.png -TIMEOUT 3000 - -MENU WIDTH 78 -MENU MARGIN 4 -MENU ROWS 6 -MENU VSHIFT 10 -MENU TIMEOUTROW 13 -MENU TABMSGROW 11 -MENU CMDLINEROW 11 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW 29 - -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu - -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std - -LABEL arch -TEXT HELP -Boot the Arch Linux live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -MENU LABEL Boot Arch Linux -LINUX boot/%ARCH%/vmlinuz -INITRD boot/%ARCH%/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% -IPAPPEND 3 - -LABEL existing -TEXT HELP -Boot an existing operating system. Press TAB to edit the disk and partition -number to boot. -ENDTEXT -MENU LABEL Boot existing OS -COM32 boot/syslinux/chain.c32 -APPEND hd0 0 - -# http://www.memtest.org/ -LABEL memtest -MENU LABEL Run Memtest86+ (RAM test) -LINUX boot/memtest - -# http://hdt-project.org/ -LABEL hdt -MENU LABEL Hardware Information (HDT) -COM32 boot/syslinux/hdt.c32 -APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz - -LABEL reboot -MENU LABEL Reboot -COM32 boot/syslinux/reboot.c32 - -LABEL poweroff -MENU LABEL Power Off -COMBOOT boot/syslinux/poweroff.com - -ONTIMEOUT arch +INCLUDE boot/syslinux/archiso_head.cfg +INCLUDE boot/syslinux/archiso_arch.cfg +INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg new file mode 100644 index 0000000..d9dee2e --- /dev/null +++ b/configs/releng/syslinux/archiso_head.cfg @@ -0,0 +1,28 @@ +SERIAL 0 38400 +DEFAULT boot/syslinux/vesamenu.c32 +PROMPT 0 +MENU TITLE Arch Linux +MENU BACKGROUND boot/syslinux/splash.png +TIMEOUT 3000 + +MENU WIDTH 78 +MENU MARGIN 4 +MENU ROWS 6 +MENU VSHIFT 10 +MENU TIMEOUTROW 13 +MENU TABMSGROW 11 +MENU CMDLINEROW 11 +MENU HELPMSGROW 16 +MENU HELPMSGENDROW 29 + +# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu + +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 31;40 #30ffffff #00000000 std diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg new file mode 100644 index 0000000..1326db8 --- /dev/null +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -0,0 +1,10 @@ +LABEL arch +TEXT HELP +Boot the Arch Linux live medium. It allows you to install Arch Linux or +perform system maintenance. +ENDTEXT +MENU LABEL Boot Arch Linux +LINUX boot/%ARCH%/vmlinuz +INITRD boot/%ARCH%/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +IPAPPEND 3 diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg new file mode 100644 index 0000000..984aace --- /dev/null +++ b/configs/releng/syslinux/archiso_tail.cfg @@ -0,0 +1,29 @@ +LABEL existing +TEXT HELP +Boot an existing operating system. Press TAB to edit the disk and partition +number to boot. +ENDTEXT +MENU LABEL Boot existing OS +COM32 boot/syslinux/chain.c32 +APPEND hd0 0 + +# http://www.memtest.org/ +LABEL memtest +MENU LABEL Run Memtest86+ (RAM test) +LINUX boot/memtest + +# http://hdt-project.org/ +LABEL hdt +MENU LABEL Hardware Information (HDT) +COM32 boot/syslinux/hdt.c32 +APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz + +LABEL reboot +MENU LABEL Reboot +COM32 boot/syslinux/reboot.c32 + +LABEL poweroff +MENU LABEL Power Off +COMBOOT boot/syslinux/poweroff.com + +ONTIMEOUT arch -- 1.7.7.4
* UI is more correct than DEFAULT for simple menu system. * Use DEFAULT instead of ONTIMEOUT * Remove PROMPT 0, this is the default value. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/baseline/syslinux/syslinux.cfg | 6 ++---- configs/releng/syslinux.dual/archiso_head.cfg | 4 ++-- configs/releng/syslinux.dual/archiso_tail.cfg | 2 -- configs/releng/syslinux/archiso_head.cfg | 4 ++-- configs/releng/syslinux/archiso_tail.cfg | 2 -- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index 5ae9823..c9632d8 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -1,5 +1,5 @@ -DEFAULT menu.c32 -PROMPT 0 +UI menu.c32 +DEFAULT arch MENU TITLE Arch Linux TIMEOUT 300 @@ -8,5 +8,3 @@ MENU LABEL Arch Linux LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% - -ONTIMEOUT arch diff --git a/configs/releng/syslinux.dual/archiso_head.cfg b/configs/releng/syslinux.dual/archiso_head.cfg index 929872e..6e8710e 100644 --- a/configs/releng/syslinux.dual/archiso_head.cfg +++ b/configs/releng/syslinux.dual/archiso_head.cfg @@ -1,6 +1,6 @@ SERIAL 0 38400 -DEFAULT boot/syslinux/vesamenu.c32 -PROMPT 0 +UI boot/syslinux/vesamenu.c32 +DEFAULT arch32 MENU TITLE Arch Linux MENU BACKGROUND boot/syslinux/splash.png TIMEOUT 3000 diff --git a/configs/releng/syslinux.dual/archiso_tail.cfg b/configs/releng/syslinux.dual/archiso_tail.cfg index a2040d1..a55548c 100644 --- a/configs/releng/syslinux.dual/archiso_tail.cfg +++ b/configs/releng/syslinux.dual/archiso_tail.cfg @@ -25,5 +25,3 @@ COM32 boot/syslinux/reboot.c32 LABEL poweroff MENU LABEL Power Off COMBOOT boot/syslinux/poweroff.com - -ONTIMEOUT arch32 diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index d9dee2e..f9b871d 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -1,6 +1,6 @@ SERIAL 0 38400 -DEFAULT boot/syslinux/vesamenu.c32 -PROMPT 0 +UI boot/syslinux/vesamenu.c32 +DEFAULT arch MENU TITLE Arch Linux MENU BACKGROUND boot/syslinux/splash.png TIMEOUT 3000 diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg index 984aace..a55548c 100644 --- a/configs/releng/syslinux/archiso_tail.cfg +++ b/configs/releng/syslinux/archiso_tail.cfg @@ -25,5 +25,3 @@ COM32 boot/syslinux/reboot.c32 LABEL poweroff MENU LABEL Power Off COMBOOT boot/syslinux/poweroff.com - -ONTIMEOUT arch -- 1.7.7.4
Am 02.12.2011 04:45, schrieb Gerardo Exequiel Pozzi:
* UI is more correct than DEFAULT for simple menu system.
Good.
* Use DEFAULT instead of ONTIMEOUT
Why do we have a timeout anyway? I configured the netboot environment without timeout, and without DEFAULT or ONTIMEOUT options.
* Remove PROMPT 0, this is the default value.
Good.
On 12/02/2011 03:49 AM, Thomas Bächler wrote:
Am 02.12.2011 04:45, schrieb Gerardo Exequiel Pozzi:
* UI is more correct than DEFAULT for simple menu system. Good.
* Use DEFAULT instead of ONTIMEOUT Why do we have a timeout anyway? I configured the netboot environment without timeout, and without DEFAULT or ONTIMEOUT options. Sure, I do not know it was here for long time. I agree in removing TIMEOUT and DEFAULT, just let user to choose...
* Remove PROMPT 0, this is the default value. Good.
-- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
* Now we have more than one PXE boot methods. * archiso_ndb_srv= accepts special ${pxeserver} parameter like in others PXE hooks. * This allows to setup network from initramfs without forcing using a special PXE hook. * Update README Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- README | 6 +++++- archiso/hooks/archiso_pxe_curl | 2 ++ archiso/hooks/archiso_pxe_nbd | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README b/README index 59c1724..53dabd0 100644 --- a/README +++ b/README @@ -3,7 +3,10 @@ INDEX * Boot parameters (initramfs stage) * hooks/archiso + * hooks/archiso_pxe_common * hooks/archiso_pxe_nbd + * hooks/archiso_pxe_curl + * hooks/archiso_pxe_nfs * hooks/archiso_loop_mnt * Boot parameters (only for configs/releng) * etc/rc.conf @@ -80,7 +83,8 @@ INDEX * archiso_nbd_name= Set NBD export name used by the server. Default: archiso * archiso_nbd_srv= Set an IP address where NBD reside. - Default: "${pxeserver}" (The <boot-server-ip from ip=) + If ${pxeserver} is used, PXE IP will be used. + Default: (unset) ** hooks/archiso_pxe_curl diff --git a/archiso/hooks/archiso_pxe_curl b/archiso/hooks/archiso_pxe_curl index 80315bc..27deee9 100644 --- a/archiso/hooks/archiso_pxe_curl +++ b/archiso/hooks/archiso_pxe_curl @@ -2,8 +2,10 @@ run_hook() { if [[ -n "${ip}" && -n "${archiso_curl_url}" ]]; then + archiso_curl_url=$(eval echo ${archiso_curl_url}) [[ -z "${curlspace_size}" ]] && curlspace_size="75%" + mount_handler="archiso_pxe_curl_mount_handler" fi } diff --git a/archiso/hooks/archiso_pxe_nbd b/archiso/hooks/archiso_pxe_nbd index 07e6fee..6147d06 100644 --- a/archiso/hooks/archiso_pxe_nbd +++ b/archiso/hooks/archiso_pxe_nbd @@ -1,9 +1,10 @@ # vim: set ft=sh: run_hook() { - if [[ -n "${ip}" ]]; then + if [[ -n "${ip}" && -n "${archiso_nbd_srv}" ]]; then + + archiso_nbd_srv=$(eval echo ${archiso_nbd_srv}) [[ -z "${archiso_nbd_name}" ]] && archiso_nbd_name="archiso" - [[ -z "${archiso_nbd_srv}" ]] && archiso_nbd_srv="${pxeserver}" mount_handler="archiso_pxe_nbd_mount_handler" fi -- 1.7.7.4
* 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> --- configs/releng/syslinux.dual/archiso.cfg | 17 +++---- configs/releng/syslinux.dual/archiso_32only.cfg | 3 - configs/releng/syslinux.dual/archiso_arch32.cfg | 10 ---- configs/releng/syslinux.dual/archiso_arch64.cfg | 10 ---- configs/releng/syslinux.dual/archiso_both.cfg | 4 -- configs/releng/syslinux.dual/archiso_pxe32.cfg | 43 ++++++++++++++++++ configs/releng/syslinux.dual/archiso_pxe64.cfg | 43 ++++++++++++++++++ .../releng/syslinux.dual/archiso_pxe_32_inc.cfg | 3 + .../releng/syslinux.dual/archiso_pxe_both_inc.cfg | 4 ++ .../releng/syslinux.dual/archiso_pxe_choose.cfg | 11 +++++ configs/releng/syslinux.dual/archiso_sys32.cfg | 9 ++++ configs/releng/syslinux.dual/archiso_sys64.cfg | 9 ++++ .../releng/syslinux.dual/archiso_sys_32_inc.cfg | 3 + .../releng/syslinux.dual/archiso_sys_both_inc.cfg | 4 ++ .../releng/syslinux.dual/archiso_sys_choose.cfg | 11 +++++ configs/releng/syslinux/archiso.cfg | 14 +++++- configs/releng/syslinux/archiso_pxe.cfg | 46 ++++++++++++++++++++ configs/releng/syslinux/archiso_pxe_inc.cfg | 3 + configs/releng/syslinux/archiso_sys.cfg | 1 - configs/releng/syslinux/archiso_sys_inc.cfg | 3 + 20 files changed, 211 insertions(+), 40 deletions(-) delete mode 100644 configs/releng/syslinux.dual/archiso_32only.cfg delete mode 100644 configs/releng/syslinux.dual/archiso_arch32.cfg delete mode 100644 configs/releng/syslinux.dual/archiso_arch64.cfg delete mode 100644 configs/releng/syslinux.dual/archiso_both.cfg create mode 100644 configs/releng/syslinux.dual/archiso_pxe32.cfg create mode 100644 configs/releng/syslinux.dual/archiso_pxe64.cfg create mode 100644 configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg create mode 100644 configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg create mode 100644 configs/releng/syslinux.dual/archiso_pxe_choose.cfg create mode 100644 configs/releng/syslinux.dual/archiso_sys32.cfg create mode 100644 configs/releng/syslinux.dual/archiso_sys64.cfg create mode 100644 configs/releng/syslinux.dual/archiso_sys_32_inc.cfg create mode 100644 configs/releng/syslinux.dual/archiso_sys_both_inc.cfg create mode 100644 configs/releng/syslinux.dual/archiso_sys_choose.cfg create mode 100644 configs/releng/syslinux/archiso_pxe.cfg create mode 100644 configs/releng/syslinux/archiso_pxe_inc.cfg create mode 100644 configs/releng/syslinux/archiso_sys_inc.cfg 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_32only.cfg b/configs/releng/syslinux.dual/archiso_32only.cfg deleted file mode 100644 index e0cad88..0000000 --- a/configs/releng/syslinux.dual/archiso_32only.cfg +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_arch32.cfg -INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux.dual/archiso_arch32.cfg b/configs/releng/syslinux.dual/archiso_arch32.cfg deleted file mode 100644 index e7c7e23..0000000 --- a/configs/releng/syslinux.dual/archiso_arch32.cfg +++ /dev/null @@ -1,10 +0,0 @@ -LABEL arch32 -TEXT HELP -Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -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_arch64.cfg deleted file mode 100644 index aee7bb0..0000000 --- a/configs/releng/syslinux.dual/archiso_arch64.cfg +++ /dev/null @@ -1,10 +0,0 @@ -LABEL arch64 -TEXT HELP -Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or -perform system maintenance. -ENDTEXT -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_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_pxe32.cfg b/configs/releng/syslinux.dual/archiso_pxe32.cfg new file mode 100644 index 0000000..737bae6 --- /dev/null +++ b/configs/releng/syslinux.dual/archiso_pxe32.cfg @@ -0,0 +1,43 @@ +LABEL arch32 +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..5d4a9c5 --- /dev/null +++ b/configs/releng/syslinux.dual/archiso_pxe64.cfg @@ -0,0 +1,43 @@ +LABEL arch64 +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_pxe_32_inc.cfg b/configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg new file mode 100644 index 0000000..e4115df --- /dev/null +++ b/configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg @@ -0,0 +1,3 @@ +INCLUDE boot/syslinux/archiso_head.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_sys32.cfg b/configs/releng/syslinux.dual/archiso_sys32.cfg new file mode 100644 index 0000000..261579e --- /dev/null +++ b/configs/releng/syslinux.dual/archiso_sys32.cfg @@ -0,0 +1,9 @@ +LABEL arch32 +TEXT HELP +Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or +perform system maintenance. +ENDTEXT +MENU LABEL Boot Arch Linux (i686) +LINUX boot/i686/vmlinuz +INITRD boot/i686/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux.dual/archiso_sys64.cfg b/configs/releng/syslinux.dual/archiso_sys64.cfg new file mode 100644 index 0000000..eb89813 --- /dev/null +++ b/configs/releng/syslinux.dual/archiso_sys64.cfg @@ -0,0 +1,9 @@ +LABEL arch64 +TEXT HELP +Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or +perform system maintenance. +ENDTEXT +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% 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 diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg index 1228355..126fc77 100644 --- a/configs/releng/syslinux/archiso.cfg +++ b/configs/releng/syslinux/archiso.cfg @@ -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 diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg new file mode 100644 index 0000000..16cbd46 --- /dev/null +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -0,0 +1,46 @@ +LABEL arch +arch_nbd + +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 diff --git a/configs/releng/syslinux/archiso_pxe_inc.cfg b/configs/releng/syslinux/archiso_pxe_inc.cfg new file mode 100644 index 0000000..b2b6887 --- /dev/null +++ b/configs/releng/syslinux/archiso_pxe_inc.cfg @@ -0,0 +1,3 @@ +INCLUDE boot/syslinux/archiso_head.cfg +INCLUDE boot/syslinux/archiso_pxe.cfg +INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index 1326db8..35303db 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -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 diff --git a/configs/releng/syslinux/archiso_sys_inc.cfg b/configs/releng/syslinux/archiso_sys_inc.cfg new file mode 100644 index 0000000..56c6a17 --- /dev/null +++ b/configs/releng/syslinux/archiso_sys_inc.cfg @@ -0,0 +1,3 @@ +INCLUDE boot/syslinux/archiso_head.cfg +INCLUDE boot/syslinux/archiso_sys.cfg +INCLUDE boot/syslinux/archiso_tail.cfg -- 1.7.7.4
Am 02.12.2011 04:45, schrieb Gerardo Exequiel Pozzi:
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- configs/releng/syslinux/archiso.cfg | 72 +---------------------------- configs/releng/syslinux/archiso_head.cfg | 28 ++++++++++++ configs/releng/syslinux/archiso_sys.cfg | 10 ++++ configs/releng/syslinux/archiso_tail.cfg | 29 ++++++++++++ 4 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 configs/releng/syslinux/archiso_head.cfg create mode 100644 configs/releng/syslinux/archiso_sys.cfg create mode 100644 configs/releng/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg index e508bcc..1228355 100644 --- a/configs/releng/syslinux/archiso.cfg +++ b/configs/releng/syslinux/archiso.cfg @@ -1,69 +1,3 @@ -SERIAL 0 38400 [...] +INCLUDE boot/syslinux/archiso_head.cfg +INCLUDE boot/syslinux/archiso_arch.cfg +INCLUDE boot/syslinux/archiso_tail.cfg
The SERIAL statement must be the first statement, always. I didn't test it, but I don't know if it works after INCLUDE, and I don't know if it works if we load a config file using CONFIG. To be sure, always hardcode the SERIAL statement into every top-level config file that is loaded directly by the bootloader.
On 12/02/2011 03:46 AM, Thomas Bächler wrote:
Am 02.12.2011 04:45, schrieb Gerardo Exequiel Pozzi:
Signed-off-by: Gerardo Exequiel Pozzi<vmlinuz386@yahoo.com.ar> --- configs/releng/syslinux/archiso.cfg | 72 +---------------------------- configs/releng/syslinux/archiso_head.cfg | 28 ++++++++++++ configs/releng/syslinux/archiso_sys.cfg | 10 ++++ configs/releng/syslinux/archiso_tail.cfg | 29 ++++++++++++ 4 files changed, 70 insertions(+), 69 deletions(-) create mode 100644 configs/releng/syslinux/archiso_head.cfg create mode 100644 configs/releng/syslinux/archiso_sys.cfg create mode 100644 configs/releng/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg index e508bcc..1228355 100644 --- a/configs/releng/syslinux/archiso.cfg +++ b/configs/releng/syslinux/archiso.cfg @@ -1,69 +1,3 @@ -SERIAL 0 38400 [...] +INCLUDE boot/syslinux/archiso_head.cfg +INCLUDE boot/syslinux/archiso_arch.cfg +INCLUDE boot/syslinux/archiso_tail.cfg The SERIAL statement must be the first statement, always. I didn't test it, but I don't know if it works after INCLUDE, and I don't know if it works if we load a config file using CONFIG.
To be sure, always hardcode the SERIAL statement into every top-level config file that is loaded directly by the bootloader.
Yes its works. Indeed I always work all time with serial console in qemu :P I think it can fail if something goes wrong before reading SERIAL directive. -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
Am 02.12.2011 13:20, schrieb Gerardo Exequiel Pozzi:
Yes its works. Indeed I always work all time with serial console in qemu :P
I think it can fail if something goes wrong before reading SERIAL directive.
That means I can simplify my netboot configurations.
On 12/02/2011 09:29 AM, Thomas Bächler wrote:
Am 02.12.2011 13:20, schrieb Gerardo Exequiel Pozzi:
Yes its works. Indeed I always work all time with serial console in qemu :P
I think it can fail if something goes wrong before reading SERIAL directive. That means I can simplify my netboot configurations.
Good. Do you agree with "Use whichsys.c32 to determine bootloader type" ? -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
Am 02.12.2011 14:49, schrieb Gerardo Exequiel Pozzi:
On 12/02/2011 09:29 AM, Thomas Bächler wrote:
Am 02.12.2011 13:20, schrieb Gerardo Exequiel Pozzi:
Yes its works. Indeed I always work all time with serial console in qemu :P
I think it can fail if something goes wrong before reading SERIAL directive. That means I can simplify my netboot configurations.
Good.
Do you agree with "Use whichsys.c32 to determine bootloader type" ?
If you really want to do this, this seems like the best option.
On 12/02/2011 11:49 AM, Thomas Bächler wrote:
Am 02.12.2011 14:49, schrieb Gerardo Exequiel Pozzi:
On 12/02/2011 09:29 AM, Thomas Bächler wrote:
Am 02.12.2011 13:20, schrieb Gerardo Exequiel Pozzi:
Yes its works. Indeed I always work all time with serial console in qemu :P
I think it can fail if something goes wrong before reading SERIAL directive. That means I can simplify my netboot configurations.
Good.
Do you agree with "Use whichsys.c32 to determine bootloader type" ?
If you really want to do this, this seems like the best option.
OK. Thanks. -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
On 12/02/2011 12:19 PM, Gerardo Exequiel Pozzi wrote:
On 12/02/2011 11:49 AM, Thomas Bächler wrote:
Am 02.12.2011 14:49, schrieb Gerardo Exequiel Pozzi:
On 12/02/2011 09:29 AM, Thomas Bächler wrote:
Am 02.12.2011 13:20, schrieb Gerardo Exequiel Pozzi:
Yes its works. Indeed I always work all time with serial console in qemu :P
I think it can fail if something goes wrong before reading SERIAL directive. That means I can simplify my netboot configurations.
Good.
Do you agree with "Use whichsys.c32 to determine bootloader type" ?
If you really want to do this, this seems like the best option.
OK. Thanks.
pushed and updated the wiki :) https://wiki.archlinux.org/index.php/Archiso_as_pxe_server#HTTP.2FFTP_and_NF... -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (2)
-
Gerardo Exequiel Pozzi
-
Thomas Bächler