diff options
| author | Florian Pritz <bluewind@xinu.at> | 2016-10-06 13:58:37 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2016-10-06 13:58:37 +0200 |
| commit | d6ea642b214f4bd242256bfb001ea055404a96ba (patch) | |
| tree | bdbdf780171a0d1d25b22db465b9483ff26e87ef | |
| parent | 43e9481276fbeb342e183d69af299b251c5447c8 (diff) | |
| download | archiso-config-d6ea642b214f4bd242256bfb001ea055404a96ba.tar.gz archiso-config-d6ea642b214f4bd242256bfb001ea055404a96ba.tar.xz | |
Drop i686 support
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -rwxr-xr-x | build.sh | 8 | ||||
| -rw-r--r-- | syslinux/archiso_pxe64.cfg | 40 | ||||
| -rw-r--r-- | syslinux/archiso_pxe_both_inc.cfg | 2 | ||||
| -rw-r--r-- | syslinux/syslinux.cfg | 3 |
4 files changed, 27 insertions, 26 deletions
@@ -249,19 +249,19 @@ mkdir -p ${work_dir} run_once make_pacman_conf # Do all stuff for each airootfs -for arch in i686 x86_64; do +for arch in x86_64; do run_once make_basefs run_once make_packages done run_once make_packages_efi -for arch in i686 x86_64; do +for arch in x86_64; do run_once make_setup_mkinitcpio run_once make_customize_airootfs done -for arch in i686 x86_64; do +for arch in x86_64; do run_once make_boot done @@ -272,7 +272,7 @@ run_once make_isolinux run_once make_efi run_once make_efiboot -for arch in i686 x86_64; do +for arch in x86_64; do run_once make_prepare done diff --git a/syslinux/archiso_pxe64.cfg b/syslinux/archiso_pxe64.cfg index 2598916..e5e8978 100644 --- a/syslinux/archiso_pxe64.cfg +++ b/syslinux/archiso_pxe64.cfg @@ -1,24 +1,24 @@ -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_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_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 diff --git a/syslinux/archiso_pxe_both_inc.cfg b/syslinux/archiso_pxe_both_inc.cfg index 1593303..7eaac4b 100644 --- a/syslinux/archiso_pxe_both_inc.cfg +++ b/syslinux/archiso_pxe_both_inc.cfg @@ -1,4 +1,4 @@ INCLUDE boot/syslinux/archiso_head.cfg INCLUDE boot/syslinux/archiso_pxe64.cfg -INCLUDE boot/syslinux/archiso_pxe32.cfg +#INCLUDE boot/syslinux/archiso_pxe32.cfg INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/syslinux/syslinux.cfg b/syslinux/syslinux.cfg index 3ee98de..1ef0e2d 100644 --- a/syslinux/syslinux.cfg +++ b/syslinux/syslinux.cfg @@ -1,4 +1,5 @@ -DEFAULT loadconfig +DEFAULT arch64_http +TIMEOUT 50 LABEL loadconfig CONFIG archiso.cfg |