From 1de1ff1a297fc9cef517be263be4f873a1d01d65 Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 1 Aug 2020 16:14:19 -0400 Subject: sync releng with archiso v46 and fix baseline mkinitcpio.conf hooks Signed-off-by: David P --- configs/releng/syslinux/parabolaiso.cfg | 3 +++ configs/releng/syslinux/parabolaiso_head.cfg | 3 +++ configs/releng/syslinux/parabolaiso_pxe32.cfg | 9 ++++++--- configs/releng/syslinux/parabolaiso_pxe64.cfg | 9 ++++++--- configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg | 3 +++ configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg | 3 +++ configs/releng/syslinux/parabolaiso_pxe_choose.cfg | 3 +++ configs/releng/syslinux/parabolaiso_sys32.cfg | 8 +++++++- configs/releng/syslinux/parabolaiso_sys64.cfg | 8 +++++++- configs/releng/syslinux/parabolaiso_sys_32_inc.cfg | 3 +++ configs/releng/syslinux/parabolaiso_sys_both_inc.cfg | 3 +++ configs/releng/syslinux/parabolaiso_sys_choose.cfg | 3 +++ configs/releng/syslinux/parabolaiso_tail.cfg | 11 +++++++++++ configs/releng/syslinux/syslinux.cfg | 3 +++ 14 files changed, 64 insertions(+), 8 deletions(-) (limited to 'configs/releng/syslinux') diff --git a/configs/releng/syslinux/parabolaiso.cfg b/configs/releng/syslinux/parabolaiso.cfg index 473e245..e38642c 100644 --- a/configs/releng/syslinux/parabolaiso.cfg +++ b/configs/releng/syslinux/parabolaiso.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + DEFAULT select LABEL select diff --git a/configs/releng/syslinux/parabolaiso_head.cfg b/configs/releng/syslinux/parabolaiso_head.cfg index 657eeea..f1f7635 100644 --- a/configs/releng/syslinux/parabolaiso_head.cfg +++ b/configs/releng/syslinux/parabolaiso_head.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + SERIAL 0 38400 UI boot/syslinux/vesamenu.c32 MENU TITLE Parabola GNU/Linux-libre diff --git a/configs/releng/syslinux/parabolaiso_pxe32.cfg b/configs/releng/syslinux/parabolaiso_pxe32.cfg index 9df86b7..4e88b06 100644 --- a/configs/releng/syslinux/parabolaiso_pxe32.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe32.cfg @@ -1,10 +1,13 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + LABEL parabola32_nbd TEXT HELP Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD) -LINUX boot/i686/vmlinuz +LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} SYSAPPEND 3 @@ -15,7 +18,7 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS) -LINUX boot/i686/vmlinuz +LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt SYSAPPEND 3 @@ -26,7 +29,7 @@ Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP) -LINUX boot/i686/vmlinuz +LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ SYSAPPEND 3 diff --git a/configs/releng/syslinux/parabolaiso_pxe64.cfg b/configs/releng/syslinux/parabolaiso_pxe64.cfg index be3e3de..4f6ca04 100644 --- a/configs/releng/syslinux/parabolaiso_pxe64.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe64.cfg @@ -1,10 +1,13 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + LABEL parabola64_nbd TEXT HELP Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD) -LINUX boot/x86_64/vmlinuz +LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver} SYSAPPEND 3 @@ -15,7 +18,7 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS) -LINUX boot/x86_64/vmlinuz +LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt SYSAPPEND 3 @@ -26,7 +29,7 @@ Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP). It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP) -LINUX boot/x86_64/vmlinuz +LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/ SYSAPPEND 3 diff --git a/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg b/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg index ba514cb..c5c00e6 100644 --- a/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe_32_inc.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/parabolaiso_head.cfg INCLUDE boot/syslinux/parabolaiso_pxe32.cfg INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg b/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg index 9396d9b..0c5be94 100644 --- a/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe_both_inc.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/parabolaiso_head.cfg INCLUDE boot/syslinux/parabolaiso_pxe64.cfg INCLUDE boot/syslinux/parabolaiso_pxe32.cfg diff --git a/configs/releng/syslinux/parabolaiso_pxe_choose.cfg b/configs/releng/syslinux/parabolaiso_pxe_choose.cfg index a3a768f..079fd7d 100644 --- a/configs/releng/syslinux/parabolaiso_pxe_choose.cfg +++ b/configs/releng/syslinux/parabolaiso_pxe_choose.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + DEFAULT choose LABEL choose diff --git a/configs/releng/syslinux/parabolaiso_sys32.cfg b/configs/releng/syslinux/parabolaiso_sys32.cfg index 4abdf7a..819dd56 100644 --- a/configs/releng/syslinux/parabolaiso_sys32.cfg +++ b/configs/releng/syslinux/parabolaiso_sys32.cfg @@ -1,9 +1,15 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +DEFAULT parabola32 +TIMEOUT 30 + LABEL parabola32 TEXT HELP Boot the Parabola GNU/Linux-libre (i686) live medium. It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (i686) -LINUX boot/i686/vmlinuz +LINUX boot/i686/vmlinuz-linux-libre INITRD boot/i686/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/syslinux/parabolaiso_sys64.cfg b/configs/releng/syslinux/parabolaiso_sys64.cfg index b154459..265464a 100644 --- a/configs/releng/syslinux/parabolaiso_sys64.cfg +++ b/configs/releng/syslinux/parabolaiso_sys64.cfg @@ -1,9 +1,15 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +DEFAULT parabola64 +TIMEOUT 30 + LABEL parabola64 TEXT HELP Boot the Parabola GNU/Linux-libre (x86_64) live medium. It allows you to install Parabola GNU/Linux-libre or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) -LINUX boot/x86_64/vmlinuz +LINUX boot/x86_64/vmlinuz-linux-libre INITRD boot/x86_64/parabolaiso.img APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg b/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg index c641201..1e7c196 100644 --- a/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_32_inc.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/parabolaiso_head.cfg INCLUDE boot/syslinux/parabolaiso_sys32.cfg INCLUDE boot/syslinux/parabolaiso_tail.cfg diff --git a/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg b/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg index 9dfb87f..04f89d4 100644 --- a/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_both_inc.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/parabolaiso_head.cfg INCLUDE boot/syslinux/parabolaiso_sys64.cfg INCLUDE boot/syslinux/parabolaiso_sys32.cfg diff --git a/configs/releng/syslinux/parabolaiso_sys_choose.cfg b/configs/releng/syslinux/parabolaiso_sys_choose.cfg index d436062..2d41bb9 100644 --- a/configs/releng/syslinux/parabolaiso_sys_choose.cfg +++ b/configs/releng/syslinux/parabolaiso_sys_choose.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + DEFAULT choose LABEL choose diff --git a/configs/releng/syslinux/parabolaiso_tail.cfg b/configs/releng/syslinux/parabolaiso_tail.cfg index e85d8e1..685e1c8 100644 --- a/configs/releng/syslinux/parabolaiso_tail.cfg +++ b/configs/releng/syslinux/parabolaiso_tail.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + LABEL existing TEXT HELP Boot an existing operating system. @@ -19,9 +22,17 @@ COM32 boot/syslinux/hdt.c32 APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz LABEL reboot +TEXT HELP +Reboot computer. +The computer's firmware must support APM. +ENDTEXT MENU LABEL Reboot COM32 boot/syslinux/reboot.c32 LABEL poweroff +TEXT HELP +Power off computer. +The computer's firmware must support APM. +ENDTEXT MENU LABEL Power Off COM32 boot/syslinux/poweroff.c32 diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg index 0869ed2..f0239ac 100644 --- a/configs/releng/syslinux/syslinux.cfg +++ b/configs/releng/syslinux/syslinux.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + DEFAULT loadconfig LABEL loadconfig -- cgit v1.2.2