From 01b54d240624e56b3e5415b6cf56a7fc3c987f24 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 23 Jan 2017 14:05:25 -0300 Subject: [configs/releng] Do not build i686 Only avoid build i686. The syslinux config files for i686 are still present. This implies that a i686 entry will be present but not working. In another patch, this can be removed if desired. Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index c208a15..71b6346 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -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 -- cgit v1.2.3-54-g00ecf From 34d6ef3fa496be9ba1ba6f4f85f81ba7b65f7e9b Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 12 Feb 2017 18:54:43 -0300 Subject: [configs/releng] Remove i686 syslinux files Signed-off-by: Gerardo Exequiel Pozzi --- configs/releng/syslinux/archiso.cfg | 4 +-- configs/releng/syslinux/archiso_pxe.cfg | 36 ++++++++++++++++++++++++ configs/releng/syslinux/archiso_pxe32.cfg | 32 --------------------- configs/releng/syslinux/archiso_pxe64.cfg | 32 --------------------- configs/releng/syslinux/archiso_pxe_32_inc.cfg | 3 -- configs/releng/syslinux/archiso_pxe_both_inc.cfg | 4 --- configs/releng/syslinux/archiso_pxe_choose.cfg | 11 -------- configs/releng/syslinux/archiso_sys.cfg | 13 +++++++++ configs/releng/syslinux/archiso_sys32.cfg | 9 ------ configs/releng/syslinux/archiso_sys64.cfg | 9 ------ configs/releng/syslinux/archiso_sys_32_inc.cfg | 3 -- configs/releng/syslinux/archiso_sys_both_inc.cfg | 4 --- configs/releng/syslinux/archiso_sys_choose.cfg | 11 -------- 13 files changed, 51 insertions(+), 120 deletions(-) create mode 100644 configs/releng/syslinux/archiso_pxe.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe32.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe64.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe_32_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe_both_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_pxe_choose.cfg create mode 100644 configs/releng/syslinux/archiso_sys.cfg delete mode 100644 configs/releng/syslinux/archiso_sys32.cfg delete mode 100644 configs/releng/syslinux/archiso_sys64.cfg delete mode 100644 configs/releng/syslinux/archiso_sys_32_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_sys_both_inc.cfg delete mode 100644 configs/releng/syslinux/archiso_sys_choose.cfg 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_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg new file mode 100644 index 0000000..481371a --- /dev/null +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -0,0 +1,36 @@ +INCLUDE boot/syslinux/archiso_head.cfg + +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 + +INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_pxe32.cfg b/configs/releng/syslinux/archiso_pxe32.cfg deleted file mode 100644 index aaa793e..0000000 --- a/configs/releng/syslinux/archiso_pxe32.cfg +++ /dev/null @@ -1,32 +0,0 @@ -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/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} -SYSAPPEND 3 - -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/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/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ -SYSAPPEND 3 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_32_inc.cfg b/configs/releng/syslinux/archiso_pxe_32_inc.cfg deleted file mode 100644 index e4115df..0000000 --- a/configs/releng/syslinux/archiso_pxe_32_inc.cfg +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_pxe32.cfg -INCLUDE boot/syslinux/archiso_tail.cfg 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_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg new file mode 100644 index 0000000..0c82573 --- /dev/null +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -0,0 +1,13 @@ +INCLUDE boot/syslinux/archiso_head.cfg + +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% + +INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux/archiso_sys32.cfg b/configs/releng/syslinux/archiso_sys32.cfg deleted file mode 100644 index 9d4d24b..0000000 --- a/configs/releng/syslinux/archiso_sys32.cfg +++ /dev/null @@ -1,9 +0,0 @@ -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/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% 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_32_inc.cfg b/configs/releng/syslinux/archiso_sys_32_inc.cfg deleted file mode 100644 index 9e37093..0000000 --- a/configs/releng/syslinux/archiso_sys_32_inc.cfg +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_sys32.cfg -INCLUDE boot/syslinux/archiso_tail.cfg 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 -- cgit v1.2.3-54-g00ecf From d5102724fbacb8f980db346e0caa8b5a85d9edb6 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sun, 12 Feb 2017 19:16:15 -0300 Subject: [archiso] Update docs Signed-off-by: Gerardo Exequiel Pozzi --- docs/README.altbootmethods | 18 ++---------------- docs/README.bootparams | 2 +- docs/README.transfer | 4 ++-- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/docs/README.altbootmethods b/docs/README.altbootmethods index 9df20ef..996990d 100644 --- a/docs/README.altbootmethods +++ b/docs/README.altbootmethods @@ -35,13 +35,6 @@ menuentry "Arch Linux (x86_64)" { initrd (loop)/arch/boot/x86_64/archiso.img } -menuentry "Arch Linux (i686)" { - set isofile="//archlinux-..
-dual.iso" - loopback loop (hd,

)$isofile - linux (loop)/arch/boot/i686/vmlinuz img_label= img_loop=$isofile - initrd (loop)/arch/boot/i686/archiso.img -} - ** ISO in memdisk mode. @@ -49,8 +42,6 @@ Note: Described method is for using with SYSLINUX. Anyway MEMDISK from SYSLINUX with other bootloaders. SYSLINUX is installed on target media and archlinux-..

-dual.iso is at path . - On 32-bit systems, is needed to pass vmalloc=nnM to the kernel, where nn is the size - of the ISO image plus 64 MiB (or 128 MiB). LABEL arch_x64 @@ -58,11 +49,6 @@ LABEL arch_x64 INITRD //archlinux-..
-dual.iso APPEND iso -LABEL arch_x32 - LINUX memdisk - INITRD //archlinux-..
-dual.iso - APPEND iso - ** Network booting (PXE). @@ -114,12 +100,12 @@ methods can be used to serve the rest of live-medium. * NBD -Note: Adjust ARCH_201408 as needed. +Note: Adjust ARCH_201703 as needed. # cat << EOF > /tmp/nbd-server.conf [generic] [archiso] readonly = true - exportname = /dev/disk/by-label/ARCH_201408 + exportname = /dev/disk/by-label/ARCH_201703 EOF # nbd-server -C /tmp/nbd-server.conf diff --git a/docs/README.bootparams b/docs/README.bootparams index 77161df..bcafc0e 100644 --- a/docs/README.bootparams +++ b/docs/README.bootparams @@ -49,7 +49,7 @@ INDEX Default: "256M" * cow_chunksize= Set chunksize used for dm-snapshot. This is number of 512 byte blocks to write at once. - Default: "8" + Default: "8" * copytoram_size= Set the size of tmpfs. This space is used for airootfs.sfs image if copytoram=y. Size is in bytes (suffix with "k", "m" and "g") or diff --git a/docs/README.transfer b/docs/README.transfer index e037f6c..cf4d41f 100644 --- a/docs/README.transfer +++ b/docs/README.transfer @@ -54,9 +54,9 @@ Nomeclature: : Mount point path where is mounted (example: /mnt/sdx/1) : Path to the ISO file archlinux-..
-dual.iso - (example: ~/archlinux-2012.07.22-dual.iso) + (example: ~/archlinux-2017.03.01-dual.iso) : Represents the filesystem label of the - (example: ARCH_201302) + (example: ARCH_201703) * PC-BIOS (MBR): -- cgit v1.2.3-54-g00ecf