Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng/syslinux
diff options
context:
space:
mode:
Diffstat (limited to 'configs/releng/syslinux')
-rw-r--r--configs/releng/syslinux/archiso.cfg11
-rw-r--r--configs/releng/syslinux/archiso_head.cfg7
-rw-r--r--configs/releng/syslinux/archiso_pxe-linux.cfg32
-rw-r--r--configs/releng/syslinux/archiso_pxe.cfg37
-rw-r--r--configs/releng/syslinux/archiso_sys-linux.cfg31
-rw-r--r--configs/releng/syslinux/archiso_sys.cfg17
-rw-r--r--configs/releng/syslinux/archiso_tail.cfg12
-rw-r--r--configs/releng/syslinux/syslinux.cfg14
8 files changed, 92 insertions, 69 deletions
diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg
deleted file mode 100644
index 40d8b34..0000000
--- a/configs/releng/syslinux/archiso.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFAULT select
-
-LABEL select
-COM32 boot/syslinux/whichsys.c32
-APPEND -pxe- pxe -sys- sys -iso- sys
-
-LABEL pxe
-CONFIG boot/syslinux/archiso_pxe.cfg
-
-LABEL sys
-CONFIG boot/syslinux/archiso_sys.cfg
diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg
index a915d34..1154f78 100644
--- a/configs/releng/syslinux/archiso_head.cfg
+++ b/configs/releng/syslinux/archiso_head.cfg
@@ -1,7 +1,7 @@
-SERIAL 0 38400
-UI boot/syslinux/vesamenu.c32
+SERIAL 0 115200
+UI vesamenu.c32
MENU TITLE Arch Linux
-MENU BACKGROUND boot/syslinux/splash.png
+MENU BACKGROUND splash.png
MENU WIDTH 78
MENU MARGIN 4
@@ -25,3 +25,4 @@ MENU COLOR msg07 37;40 #90ffffff #a0000000 std
MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
MENU CLEAR
+MENU IMMEDIATE
diff --git a/configs/releng/syslinux/archiso_pxe-linux.cfg b/configs/releng/syslinux/archiso_pxe-linux.cfg
new file mode 100644
index 0000000..4310ff8
--- /dev/null
+++ b/configs/releng/syslinux/archiso_pxe-linux.cfg
@@ -0,0 +1,32 @@
+LABEL arch32_nbd
+TEXT HELP
+Boot the Arch Linux install medium using NBD.
+It allows you to install Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Arch Linux install medium (i686, NBD)
+LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
+SYSAPPEND 3
+
+LABEL arch32_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 Arch Linux install medium (i686, NFS)
+LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
+SYSAPPEND 3
+
+LABEL arch32_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 Arch Linux install medium (i686, HTTP)
+LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
+SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index b0e66e8..b4c9a80 100644
--- a/configs/releng/syslinux/archiso_pxe.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -1,36 +1,5 @@
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE archiso_head.cfg
-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/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
-SYSAPPEND 3
+INCLUDE archiso_pxe-linux.cfg
-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/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
-SYSAPPEND 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/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
-SYSAPPEND 3
-
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys-linux.cfg b/configs/releng/syslinux/archiso_sys-linux.cfg
new file mode 100644
index 0000000..6bff367
--- /dev/null
+++ b/configs/releng/syslinux/archiso_sys-linux.cfg
@@ -0,0 +1,31 @@
+LABEL arch32
+TEXT HELP
+Boot the Arch Linux install medium on BIOS.
+It allows you to install Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Arch Linux install medium (i686, BIOS)
+LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
+
+# Accessibility boot option
+LABEL arch32speech
+TEXT HELP
+Boot the Arch Linux install medium on BIOS with speakup screen reader.
+It allows you to install Arch Linux or perform system maintenance with speech feedback.
+ENDTEXT
+MENU LABEL Arch Linux install medium (i686, BIOS) with ^speech
+LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
+
+# Copy to RAM boot option
+LABEL arch32ram
+TEXT HELP
+Boot the Arch Linux install medium on BIOS with Copy-to-RAM option
+It allows you to install Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Arch Linux install medium (i686, BIOS, Copy to RAM)
+LINUX /%INSTALL_DIR%/boot/i686/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/i686/initramfs-linux.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg
index 62bba0b..dc1a6eb 100644
--- a/configs/releng/syslinux/archiso_sys.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -1,13 +1,8 @@
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE archiso_head.cfg
-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/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
+DEFAULT arch32
+TIMEOUT 150
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE archiso_sys-linux.cfg
+
+INCLUDE archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg
index 34b6c5b..e5339a2 100644
--- a/configs/releng/syslinux/archiso_tail.cfg
+++ b/configs/releng/syslinux/archiso_tail.cfg
@@ -4,19 +4,19 @@ 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
+COM32 chain.c32
APPEND hd0 0
# http://www.memtest.org/
LABEL memtest
MENU LABEL Run Memtest86+ (RAM test)
-LINUX boot/memtest
+LINUX /%INSTALL_DIR%/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
+COM32 hdt.c32
+APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
LABEL reboot
TEXT HELP
@@ -24,7 +24,7 @@ Reboot computer.
The computer's firmware must support APM.
ENDTEXT
MENU LABEL Reboot
-COM32 boot/syslinux/reboot.c32
+COM32 reboot.c32
LABEL poweroff
TEXT HELP
@@ -32,4 +32,4 @@ Power off computer.
The computer's firmware must support APM.
ENDTEXT
MENU LABEL Power Off
-COM32 boot/syslinux/poweroff.c32
+COM32 poweroff.c32
diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg
index 3ee98de..cbda72f 100644
--- a/configs/releng/syslinux/syslinux.cfg
+++ b/configs/releng/syslinux/syslinux.cfg
@@ -1,5 +1,11 @@
-DEFAULT loadconfig
+DEFAULT select
-LABEL loadconfig
- CONFIG archiso.cfg
- APPEND ../../
+LABEL select
+COM32 whichsys.c32
+APPEND -pxe- pxe -sys- sys -iso- sys
+
+LABEL pxe
+CONFIG archiso_pxe.cfg
+
+LABEL sys
+CONFIG archiso_sys.cfg