summaryrefslogtreecommitdiff
path: root/configs/releng/syslinux
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-08-28 19:46:32 +0200
committerErich Eckner <git@eckner.net>2018-08-28 19:46:32 +0200
commitc4525c58caed448463cd8e8452ecde9c8d14c3a9 (patch)
tree343b53de2c40a25eb592dea4d444a31d9d4f74e7 /configs/releng/syslinux
parentb6abbd288fbe1dc67266be9f2ce94bcac1d49aed (diff)
parente23dbb4516ffff7e022daf05e8adae4e793cac7f (diff)
downloadarchiso32-c4525c58caed448463cd8e8452ecde9c8d14c3a9.tar.xz
Merge remote-tracking branch 'upstream/master'i686-v39
Diffstat (limited to 'configs/releng/syslinux')
-rw-r--r--configs/releng/syslinux/archiso_pxe.cfg6
-rw-r--r--configs/releng/syslinux/archiso_sys.cfg2
2 files changed, 4 insertions, 4 deletions
diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index 568bd4a..b0e66e8 100644
--- a/configs/releng/syslinux/archiso_pxe.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -7,7 +7,7 @@ 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/i686/archiso.img
+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
@@ -18,7 +18,7 @@ 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/i686/archiso.img
+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
@@ -29,7 +29,7 @@ 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/i686/archiso.img
+INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg
index b7b9f21..62bba0b 100644
--- a/configs/releng/syslinux/archiso_sys.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -7,7 +7,7 @@ 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/i686/archiso.img
+INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
INCLUDE boot/syslinux/archiso_tail.cfg