Merge pull request #6 from brain0/workingrelease_2017-03-13

Update netboot images and disable i686 support

8 files changed, 18 insertions, 21 deletions

diff --git a/releng/views.py b/releng/views.py
index 9e7a794e..b2bafb49 100644
--- a/releng/views.py
+++ b/releng/views.py
@@ -293,7 +293,6 @@ def netboot_config(request):
     mirrorurls = sorted( mirrorurls,
                          key=lambda x: x.country.name)
     context = {
-        'archs': [ 'i686', 'x86_64' ],
         'releases': releases,
         'mirrorurls': mirrorurls,
     }
diff --git a/sitestatic/netboot/ipxe.efi b/sitestatic/netboot/ipxe.efi
index e491dc38..d5d21f18 100644
--- a/sitestatic/netboot/ipxe.efi
+++ b/sitestatic/netboot/ipxe.efi
diff --git a/sitestatic/netboot/ipxe.efi.sig b/sitestatic/netboot/ipxe.efi.sig
index 65f652c9..4d211e16 100644
--- a/sitestatic/netboot/ipxe.efi.sig
+++ b/sitestatic/netboot/ipxe.efi.sig
diff --git a/sitestatic/netboot/ipxe.lkrn b/sitestatic/netboot/ipxe.lkrn
index a55ee8d1..3b4d69cd 100644
--- a/sitestatic/netboot/ipxe.lkrn
+++ b/sitestatic/netboot/ipxe.lkrn
diff --git a/sitestatic/netboot/ipxe.lkrn.sig b/sitestatic/netboot/ipxe.lkrn.sig
index b7852f5c..a8c6e161 100644
--- a/sitestatic/netboot/ipxe.lkrn.sig
+++ b/sitestatic/netboot/ipxe.lkrn.sig
diff --git a/sitestatic/netboot/ipxe.pxe b/sitestatic/netboot/ipxe.pxe
index d1cad8f5..5cff4459 100644
--- a/sitestatic/netboot/ipxe.pxe
+++ b/sitestatic/netboot/ipxe.pxe
diff --git a/sitestatic/netboot/ipxe.pxe.sig b/sitestatic/netboot/ipxe.pxe.sig
index deecc79e..ab7bea07 100644
--- a/sitestatic/netboot/ipxe.pxe.sig
+++ b/sitestatic/netboot/ipxe.pxe.sig
diff --git a/templates/releng/archlinux.ipxe b/templates/releng/archlinux.ipxe
index 4945868c..8f3dd6e4 100644
--- a/templates/releng/archlinux.ipxe
+++ b/templates/releng/archlinux.ipxe
@@ -8,16 +8,17 @@ cpuid --ext 29 && set cpuarch x86_64 || set cpuarch i686
 imgtrust
 
 # initial options
-set bootarch ${cpuarch}
 set release {{ releases.0 }}
-set mirrorurl
 set extrabootoptions ip=dhcp net.ifnames=0
 set countrycode
 
 :main
+iseq ${cpuarch} x86_64 && goto main_x86_64 || goto main_i686
+
+:main_x86_64
 menu Arch Linux Netboot
 item --gap Settings
-item set_architecture Architecture: ${bootarch}
+item --gap Architecture: x86_64
 item set_release Release: ${release}
 isset ${mirrorurl} && item set_mirror Mirror: ${mirrorurl} || item set_mirror Choose a mirror
 item set_options Boot options: ${extrabootoptions}
@@ -29,6 +30,15 @@ item exit Exit iPXE
 isset ${mirrorurl} && choose --default set_options selected || choose --default set_mirror selected || goto shell
 goto ${selected} || goto main
 
+:main_i686
+menu Arch Linux Netboot
+item --gap ERROR: i686 is no longer supported!
+item shell Drop to iPXE shell
+item reboot Reboot
+item exit Exit iPXE
+choose --default shell selected || goto shell
+goto ${selected} || goto main
+
 :shell
 echo Type 'exit' to get the back to the menu
 shell
@@ -40,18 +50,6 @@ reboot
 :exit
 exit
 
-:set_architecture
-menu Arch Linux Netboot: Select Architecture
-item back back
-item
-item --gap Available architectures:
-iseq ${cpuarch} x86_64 && item x86_64 x64_64 ||
-item i686 i686
-choose selected || goto main
-iseq ${selected} back && goto main ||
-set bootarch ${selected}
-goto main
-
 :set_release
 menu Arch Linux Netboot: Select Release
 item back back
@@ -124,14 +122,14 @@ echo -n Boot options: ${} && read extrabootoptions ||
 goto main
 
 :boot
-echo Booting Arch Linux ${bootarch} ${release} from ${mirrorurl}
+echo Booting Arch Linux x86_64 ${release} from ${mirrorurl}
 echo
-kernel ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz || goto failed_download
-imgverify vmlinuz ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz.ipxe.sig || goto failed_verify
+kernel ${mirrorurl}iso/${release}/arch/boot/x86_64/vmlinuz || goto failed_download
+imgverify vmlinuz ${mirrorurl}iso/${release}/arch/boot/x86_64/vmlinuz.ipxe.sig || goto failed_verify
 initrd ${mirrorurl}iso/${release}/arch/boot/intel_ucode.img || goto failed_download
 imgverify intel_ucode.img ${mirrorurl}iso/${release}/arch/boot/intel_ucode.img.ipxe.sig || goto failed_verify
-initrd ${mirrorurl}iso/${release}/arch/boot/${bootarch}/archiso.img || goto failed_download
-imgverify archiso.img ${mirrorurl}iso/${release}/arch/boot/${bootarch}/archiso.img.ipxe.sig || goto failed_verify
+initrd ${mirrorurl}iso/${release}/arch/boot/x86_64/archiso.img || goto failed_download
+imgverify archiso.img ${mirrorurl}iso/${release}/arch/boot/x86_64/archiso.img.ipxe.sig || goto failed_verify
 imgargs vmlinuz initrd=intel_ucode.img initrd=archiso.img archiso_http_srv=${mirrorurl}iso/${release}/ archisobasedir=arch verify=y ${extrabootoptions}
 boot || goto failed_boot