summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-03-26 20:52:14 +0200
committerErich Eckner <git@eckner.net>2017-04-01 21:11:53 +0200
commit7c2ed8fbc6978cd1db62d1aedff2b8a4c98dc7be (patch)
tree394b425f28d960805a0b33d20846b58218ce6455
parent6a7714196cc6b5a7d8830d67aa43b8c70f6cf9f8 (diff)
downloadarchiso32-31.tar.xz
pendent to 34d6ef3: [configs/releng] Remove i686 syslinux filesv31
-rw-r--r--configs/releng/syslinux/archiso.cfg4
-rw-r--r--configs/releng/syslinux/archiso_pxe.cfg (renamed from configs/releng/syslinux/archiso_pxe32.cfg)4
-rw-r--r--configs/releng/syslinux/archiso_pxe64.cfg32
-rw-r--r--configs/releng/syslinux/archiso_pxe_both_inc.cfg4
-rw-r--r--configs/releng/syslinux/archiso_pxe_choose.cfg11
-rw-r--r--configs/releng/syslinux/archiso_sys.cfg (renamed from configs/releng/syslinux/archiso_sys32.cfg)4
-rw-r--r--configs/releng/syslinux/archiso_sys64.cfg9
-rw-r--r--configs/releng/syslinux/archiso_sys_both_inc.cfg4
-rw-r--r--configs/releng/syslinux/archiso_sys_choose.cfg11
9 files changed, 10 insertions, 73 deletions
diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg
index d1817af..40d8b34 100644
--- a/configs/releng/syslinux/archiso.cfg
+++ b/configs/releng/syslinux/archiso.cfg
@@ -5,7 +5,7 @@ COM32 boot/syslinux/whichsys.c32
APPEND -pxe- pxe -sys- sys -iso- sys
LABEL pxe
-CONFIG boot/syslinux/archiso_pxe_choose.cfg
+CONFIG boot/syslinux/archiso_pxe.cfg
LABEL sys
-CONFIG boot/syslinux/archiso_sys_choose.cfg
+CONFIG boot/syslinux/archiso_sys.cfg
diff --git a/configs/releng/syslinux/archiso_pxe32.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index aaa793e..568bd4a 100644
--- a/configs/releng/syslinux/archiso_pxe32.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -1,3 +1,5 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+
LABEL arch32_nbd
TEXT HELP
Boot the Arch Linux (i686) live medium (Using NBD).
@@ -30,3 +32,5 @@ LINUX boot/i686/vmlinuz
INITRD boot/intel_ucode.img,boot/i686/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
SYSAPPEND 3
+
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_pxe64.cfg b/configs/releng/syslinux/archiso_pxe64.cfg
deleted file mode 100644
index 2598916..0000000
--- a/configs/releng/syslinux/archiso_pxe64.cfg
+++ /dev/null
@@ -1,32 +0,0 @@
-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/intel_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
-SYSAPPEND 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/intel_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
-SYSAPPEND 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/intel_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
-SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_pxe_both_inc.cfg b/configs/releng/syslinux/archiso_pxe_both_inc.cfg
deleted file mode 100644
index 1593303..0000000
--- a/configs/releng/syslinux/archiso_pxe_both_inc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_pxe64.cfg
-INCLUDE boot/syslinux/archiso_pxe32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_pxe_choose.cfg b/configs/releng/syslinux/archiso_pxe_choose.cfg
deleted file mode 100644
index 6296065..0000000
--- a/configs/releng/syslinux/archiso_pxe_choose.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-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/archiso_sys32.cfg b/configs/releng/syslinux/archiso_sys.cfg
index 9d4d24b..b7b9f21 100644
--- a/configs/releng/syslinux/archiso_sys32.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -1,3 +1,5 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+
LABEL arch32
TEXT HELP
Boot the Arch Linux (i686) live medium.
@@ -7,3 +9,5 @@ MENU LABEL Boot Arch Linux (i686)
LINUX boot/i686/vmlinuz
INITRD boot/intel_ucode.img,boot/i686/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
+
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys64.cfg b/configs/releng/syslinux/archiso_sys64.cfg
deleted file mode 100644
index 2694968..0000000
--- a/configs/releng/syslinux/archiso_sys64.cfg
+++ /dev/null
@@ -1,9 +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/intel_ucode.img,boot/x86_64/archiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/syslinux/archiso_sys_both_inc.cfg b/configs/releng/syslinux/archiso_sys_both_inc.cfg
deleted file mode 100644
index e885c40..0000000
--- a/configs/releng/syslinux/archiso_sys_both_inc.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDE boot/syslinux/archiso_head.cfg
-INCLUDE boot/syslinux/archiso_sys64.cfg
-INCLUDE boot/syslinux/archiso_sys32.cfg
-INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys_choose.cfg b/configs/releng/syslinux/archiso_sys_choose.cfg
deleted file mode 100644
index 24c597a..0000000
--- a/configs/releng/syslinux/archiso_sys_choose.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-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