From 52a00da605ca7e0e367de44bf7c52fab033af1ba Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
Date: Wed, 1 Mar 2017 23:05:35 -0300
Subject: [configs/releng] Oops, rename -dual.iso -> -x86_64.iso

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
---
 configs/releng/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 71b6346..72b1e3f 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -213,7 +213,7 @@ make_prepare() {
 
 # Build ISO
 make_iso() {
-    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
 }
 
 if [[ ${EUID} -ne 0 ]]; then
-- 
cgit v1.2.3-70-g09d2


From 201aa13bb479f3ba067a161d23b9b4ad44e8b170 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
Date: Thu, 2 Mar 2017 12:08:21 -0300
Subject: [archiso] Fix docs -dual -> x86_64

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
---
 docs/README.altbootmethods | 10 +++++-----
 docs/README.transfer       |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/README.altbootmethods b/docs/README.altbootmethods
index 996990d..544e49b 100644
--- a/docs/README.altbootmethods
+++ b/docs/README.altbootmethods
@@ -13,7 +13,7 @@ INDEX
 
 *** Alternative boot methods (configs/releng)
 
-ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-dual.iso
+ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-x86_64.iso
 
 Where:
     <YYYY> Year
@@ -24,12 +24,12 @@ Where:
 ** ISO in loopback mode.
 
 Note: Described method is for using with GRUB2.
-      GRUB2 is installed on target media and archlinux-<YYYY>.<MM>.<DD>-dual.iso
+      GRUB2 is installed on target media and archlinux-<YYYY>.<MM>.<DD>-x86_64.iso
       is at path <TARGET-PATH> on disk <D> and partition <P>,
       where filesystem is labeled as <TARGET-FS-LABEL>.
 
 menuentry "Arch Linux (x86_64)" {
-    set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-dual.iso"
+    set isofile="/<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-x86_64.iso"
     loopback loop (hd<D>,<P>)$isofile
     linux (loop)/arch/boot/x86_64/vmlinuz img_label=<TARGET-FS-LABEL> img_loop=$isofile
     initrd (loop)/arch/boot/x86_64/archiso.img
@@ -40,13 +40,13 @@ menuentry "Arch Linux (x86_64)" {
 
 Note: Described method is for using with SYSLINUX. Anyway MEMDISK from SYSLINUX can work
       with other bootloaders.
-      SYSLINUX is installed on target media and archlinux-<YYYY>.<MM>.<DD>-dual.iso
+      SYSLINUX is installed on target media and archlinux-<YYYY>.<MM>.<DD>-x86_64.iso
       is at path <TARGET-PATH>.
 
 
 LABEL arch_x64
    LINUX memdisk
-   INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-dual.iso
+   INITRD /<TARGET-PATH>/archlinux-<YYYY>.<MM>.<DD>-x86_64.iso
    APPEND iso
 
 
diff --git a/docs/README.transfer b/docs/README.transfer
index cf4d41f..f366061 100644
--- a/docs/README.transfer
+++ b/docs/README.transfer
@@ -13,7 +13,7 @@ INDEX
 
 *** Transfer ISO image to target medium (configs/releng)
 
-ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-dual.iso
+ISO images names consist of: archlinux-<YYYY>.<MM>.<DD>-x86_64.iso
 
 Where:
     <YYYY> Year
@@ -34,7 +34,7 @@ Nomeclature:
 
 
 1) Write it directly using your favorite recording program.
-# cdrecord dev=<B>,<T>,<L> -dao archlinux-<YYYY>.<MM>.<DD>-dual.iso
+# cdrecord dev=<B>,<T>,<L> -dao archlinux-<YYYY>.<MM>.<DD>-x86_64.iso
 
 
 ** To -> USB Flash Drive (USB-key) / Memory card (SD) /
@@ -53,8 +53,8 @@ Nomeclature:
                 (example: /dev/sdx1)
 <MNT-TARGET-N>: Mount point path where <DEV-TARGET-N> is mounted
                 (example: /mnt/sdx/1)
-<ISO-SOURCE>:   Path to the ISO file archlinux-<YYYY>.<MM>.<DD>-dual.iso
-                (example: ~/archlinux-2017.03.01-dual.iso)
+<ISO-SOURCE>:   Path to the ISO file archlinux-<YYYY>.<MM>.<DD>-x86_64.iso
+                (example: ~/archlinux-2017.03.01-x86_64.iso)
 <FS-LABEL>:     Represents the filesystem label of the <ISO-SOURCE>
                 (example: ARCH_201703)
 
-- 
cgit v1.2.3-70-g09d2


From ae854ed712d15559a02600d25f3919ddc96b8d42 Mon Sep 17 00:00:00 2001
From: David Thurstenson <thurstylark@gmail.com>
Date: Fri, 10 Mar 2017 14:01:05 -0600
Subject: Add timeout to ipconfig call

Signed-off-by: David Thurstenson <thurstylark@gmail.com>
---
 archiso/initcpio/hooks/archiso_pxe_common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common
index 422e4f7..96a10c5 100644
--- a/archiso/initcpio/hooks/archiso_pxe_common
+++ b/archiso/initcpio/hooks/archiso_pxe_common
@@ -26,7 +26,7 @@ run_hook () {
         fi
 
         # setup network and save some values
-        if ! ipconfig "ip=${ip}"; then
+        if ! ipconfig -t 20 "ip=${ip}"; then
                 echo "ERROR; Failed to configure network"
                 echo "   Falling back to interactive prompt"
                 echo "   You can try to fix the problem manually, log out when you are finished"
-- 
cgit v1.2.3-70-g09d2