[arch-releng] [PATCH 3/3] [configs/releng] Introducing syslinux.dual/ifpxelinux.lua

Gerardo Exequiel Pozzi vmlinuz386 at yahoo.com.ar
Wed Nov 30 19:49:27 EST 2011 

On 11/30/2011 09:46 PM, Gerardo Exequiel Pozzi wrote:
> This patch should be squashed with previuous commit.
>
> I think, at some point will be better using syslinux submenus.
> ---
>   configs/releng/syslinux.dual/archiso.cfg           |   17 ++++----
>   .../releng/syslinux.dual/archiso_choose_nonpxe.cfg |   12 +++++
>   .../releng/syslinux.dual/archiso_choose_pxe.cfg    |   12 +++++
>   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 ++
>   configs/releng/syslinux.dual/ifpxelinux.lua        |    5 ++
>   8 files changed, 130 insertions(+), 9 deletions(-)
>   create mode 100644 configs/releng/syslinux.dual/archiso_choose_nonpxe.cfg
>   create mode 100644 configs/releng/syslinux.dual/archiso_choose_pxe.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/ifpxelinux.lua
>
> diff --git a/configs/releng/syslinux.dual/archiso.cfg b/configs/releng/syslinux.dual/archiso.cfg
> index 9994e43..25f5e93 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/lua.c32
> +APPEND boot/syslinux/ifpxelinux.lua ispxe nonpxe
>
> -LABEL have64
> -CONFIG boot/syslinux/archiso_both.cfg
> +LABEL ispxe
> +CONFIG boot/syslinux/archiso_choose_pxe.cfg
>
> -LABEL nohave64
> -CONFIG boot/syslinux/archiso_32only.cfg
> +LABEL nonpxe
> +CONFIG boot/syslinux/archiso_choose_nonpxe.cfg
> diff --git a/configs/releng/syslinux.dual/archiso_choose_nonpxe.cfg b/configs/releng/syslinux.dual/archiso_choose_nonpxe.cfg
> new file mode 100644
> index 0000000..9994e43
> --- /dev/null
> +++ b/configs/releng/syslinux.dual/archiso_choose_nonpxe.cfg
> @@ -0,0 +1,12 @@
> +DEFAULT choose
> +PROMPT 0
> +
> +LABEL choose
> +KERNEL boot/syslinux/ifcpu64.c32
> +APPEND have64 -- nohave64
> +
> +LABEL have64
> +CONFIG boot/syslinux/archiso_both.cfg
> +
> +LABEL nohave64
> +CONFIG boot/syslinux/archiso_32only.cfg
> diff --git a/configs/releng/syslinux.dual/archiso_choose_pxe.cfg b/configs/releng/syslinux.dual/archiso_choose_pxe.cfg
> new file mode 100644
> index 0000000..e34ab3d
> --- /dev/null
> +++ b/configs/releng/syslinux.dual/archiso_choose_pxe.cfg
> @@ -0,0 +1,12 @@
> +DEFAULT choose
> +PROMPT 0
> +
> +LABEL choose
> +KERNEL 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_pxe32.cfg b/configs/releng/syslinux.dual/archiso_pxe32.cfg
> new file mode 100644
> index 0000000..f68cff4
> --- /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%
> +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..c543bd7
> --- /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%
> +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/ifpxelinux.lua b/configs/releng/syslinux.dual/ifpxelinux.lua
> new file mode 100644
> index 0000000..21cafae
> --- /dev/null
> +++ b/configs/releng/syslinux.dual/ifpxelinux.lua
> @@ -0,0 +1,5 @@
> +if syslinux.derivative() == "PXELINUX" then
> +	syslinux.run_command(arg[1])
> +else
> +	syslinux.run_command(arg[2])
> +end

oops, plus this:

--- a/configs/releng/syslinux.dual/archiso_arch32.cfg
+++ b/configs/releng/syslinux.dual/archiso_arch32.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_arch64.cfg
index aee7bb0..eb89813 100644
--- a/configs/releng/syslinux.dual/archiso_arch64.cfg
+++ b/configs/releng/syslinux.dual/archiso_arch64.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

-- 
Gerardo Exequiel Pozzi
\cos^2\alpha + \sin^2\alpha = 1

More information about the arch-releng mailing list