Merge tag 'release_2017-03-13' into archweb-generic

15 files changed, 221 insertions, 26 deletions

diff --git a/mirrors/views/mirrorlist.py b/mirrors/views/mirrorlist.py
index 3c68d036..7a9ffad0 100644
--- a/mirrors/views/mirrorlist.py
+++ b/mirrors/views/mirrorlist.py
@@ -10,6 +10,7 @@ from django_countries import countries
 from ..models import MirrorUrl, MirrorProtocol
 from ..utils import get_mirror_statuses
 
+import random
 
 class MirrorlistForm(forms.Form):
     country = forms.MultipleChoiceField(required=False,
@@ -80,8 +81,9 @@ def status_filter(original_urls):
         # (as opposed to those that have been set with no score)
         if (u.id not in scores) or (u.score and u.score < 100.0):
             urls.append(u)
-    # if a url doesn't have a score, treat it as the highest possible
-    return sorted(urls, key=lambda x: x.score or 100.0)
+    # randomize list to prevent users from overloading the first mirror in the returned list
+    random.shuffle(urls)
+    return urls
 
 
 def find_mirrors(request, countries=None, protocols=None, use_status=False,
diff --git a/releng/views.py b/releng/views.py
index 03ea8a86..793249fc 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/archnavbar/archlogo.png b/sitestatic/archnavbar/archlogo.png
index e873e94b..3d2cd40f 100644
--- a/sitestatic/archnavbar/archlogo.png
+++ b/sitestatic/archnavbar/archlogo.png
diff --git a/sitestatic/archnavbar/archlogo.svg b/sitestatic/archnavbar/archlogo.svg
new file mode 100644
index 00000000..3f7aa74a
--- /dev/null
+++ b/sitestatic/archnavbar/archlogo.svg
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="600"
+   height="126"
+   id="svg2424"
+   sodipodi:docname="archlogo.svg"
+   inkscape:version="0.92.1 r">
+  <metadata
+     id="metadata114">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1362"
+     inkscape:window-height="726"
+     id="namedview112"
+     showgrid="false"
+     inkscape:zoom="2.015"
+     inkscape:cx="335.62219"
+     inkscape:cy="55.090984"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g2424" />
+  <defs
+     id="defs2426">
+    <linearGradient
+       x1="112.49854"
+       y1="6.1372099"
+       x2="112.49853"
+       y2="129.3468"
+       id="path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(287,-83)">
+      <stop
+         id="stop193"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop195"
+         style="stop-color:#ffffff;stop-opacity:0.27450982"
+         offset="1" />
+      <midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="midPointStop197" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="midPointStop199" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#000000"
+         id="midPointStop201" />
+    </linearGradient>
+    <linearGradient
+       x1="541.33502"
+       y1="104.50665"
+       x2="606.91248"
+       y2="303.14029"
+       id="linearGradient2544"
+       xlink:href="#path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.3937741,0,0,0.393752,357.51969,122.00151)" />
+    <linearGradient
+       id="linearGradient3388">
+      <stop
+         id="stop3390"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3392"
+         style="stop-color:#000000;stop-opacity:0.37113401"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="490.72305"
+       y1="237.72447"
+       x2="490.72305"
+       y2="183.9644"
+       id="linearGradient4416"
+       xlink:href="#linearGradient3388"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.749107,0,0,0.749107,-35.459862,91.44108)" />
+  </defs>
+  <g
+     transform="matrix(0.7,0,0,0.7,-37.866513,-100.53407)"
+     id="layer1">
+    <g
+       transform="matrix(0.8746356,0,0,0.8746356,14.730518,23.408954)"
+       id="g2424">
+      <g
+         transform="matrix(1.0033516,0,0,1.0033516,-35.47395,-116.45699)"
+         id="g2809"
+         style="fill:#ffffff;fill-opacity:1">
+        <path
+           d="m 339.96875,309.09375 c -14.47141,-0.0239 -26.4812,2.94367 -31.125,4.5625 l -4.78125,25.8125 c -0.0116,0.0951 23.79543,-6.34855 34.28125,-5.96875 17.36158,0.62381 18.95948,6.63541 18.65625,14.75 0.29595,0.47462 -4.47933,-7.33192 -19.5,-7.59375 -18.94961,-0.32687 -45.69284,6.70947 -45.65625,35.3125 -0.51086,32.17412 24.03361,41.63882 40.75,41.8125 15.02821,-0.27364 22.0777,-5.69136 25.9375,-8.59375 5.07124,-5.30236 10.87308,-10.63447 16.40625,-17.03125 -5.23567,9.51278 -9.77472,16.0898 -14.5,21.125 v 4.25 l 22.84375,-3.84375 0.15625,-62.09375 c -0.23141,-8.78839 5.04123,-42.41827 -43.46875,-42.5 z m -3.28125,54.0625 c 9.46889,0.12995 20.32788,4.79708 20.34375,16.03125 0.049,10.21821 -12.80005,15.71183 -21.15625,15.625 -8.35976,-0.0868 -19.45093,-6.56982 -19.5,-16.53125 0.16016,-8.90444 10.45953,-15.35418 20.3125,-15.125 z"
+           id="path2284"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 398.50106,314.83145 -0.15505,102.82693 26.61213,-5.12724 0.0449,-58.30157 c 0.006,-8.68089 12.40554,-18.82451 27.9627,-18.66287 3.30202,-5.97408 9.5087,-21.24219 11.02088,-24.71514 -34.75649,-0.0833 -35.19897,9.98993 -41.24398,14.94517 -0.0631,-9.45285 -0.0213,-15.12741 -0.0213,-15.12741 l -24.2202,4.16213 z"
+           id="path2286"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 548.2688,328.33058 c -0.25696,-0.12068 -13.87938,-15.93419 -41.26638,-16.0589 -25.65249,-0.42638 -54.42578,9.51895 -54.88631,52.5328 0.22457,37.81852 27.6402,52.59809 55.0314,52.88627 29.31292,0.30451 40.97654,-18.32947 41.67615,-18.79124 -3.49762,-3.0321 -16.59792,-16.0131 -16.59792,-16.0131 0,0 -8.18236,11.65102 -24.05802,11.79913 -15.87942,0.1512 -29.68245,-12.27325 -29.87805,-29.60905 -0.20349,-17.33595 12.68881,-26.72821 29.99725,-27.48687 14.98466,-0.003 23.6297,9.67334 23.6297,9.67334 z"
+           id="path2288"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 581.8125,278.84375 -25.125,5.90625 0.1875,133.9375 24.75,-4.46875 0.28125,-63.03125 c 0.0529,-6.60927 9.56127,-16.75916 25.4375,-16.4375 15.17973,0.15775 18.57236,10.11767 18.53125,11.375 l 0.4375,72.96875 24.40625,-4.3125 0.0937,-77.375 c 0.1607,-7.44539 -16.30833,-23.16954 -42.78125,-23.28125 -12.58087,0.0202 -19.54815,2.86825 -23.09375,4.96875 -6.06656,4.68565 -12.9998,9.17543 -19.8125,14.90625 6.29809,-8.09099 11.58551,-13.68516 16.75,-17.84375 l -0.0625,-37.3125 z"
+           id="path2290"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(1.4854426,0,0.02102071,1.4854426,24.809906,-769.96118)"
+         id="g5326"
+         style="fill:#1793d1;fill-opacity:1;stroke:none">
+        <path
+           d="m 400.67581,629.79609 7.68167,-1.91575 -0.92851,91.20792 -7.79574,1.32426 z"
+           id="path2292"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 421.10266,657.01757 6.75064,-2.9867 -0.86808,65.39931 -6.49779,1.33915 z m -1.26059,-23.58316 5.47167,-4.41533 4.42261,4.99952 -5.47558,4.53221 z"
+           id="path2294"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 440.44273,655.82614 7.67755,-1.56201 -0.1573,13.6722 c -0.007,0.58717 4.4194,-15.27364 24.68502,-14.92094 19.67986,0.10952 22.68401,15.34634 22.5291,18.76237 l -0.43759,48.0783 -6.73044,1.45631 0.63316,-47.489 c 0.0974,-1.38684 -2.88144,-13.11441 -16.78906,-13.15754 -13.90509,-0.0404 -23.68364,10.10048 -23.75821,16.57937 l -0.48127,41.83477 -7.80388,2.0313 z"
+           id="path2296"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 561.53301,720.20203 -7.6776,1.56186 0.15737,-13.67198 c 0.007,-0.58742 -4.42201,15.27361 -24.68504,14.92086 -19.67983,-0.10944 -22.68399,-15.34626 -22.52908,-18.76229 l 0.43757,-48.07861 8.15674,-1.64226 -0.54644,47.48988 c -0.0149,1.29682 1.36845,13.29979 15.27604,13.3426 13.90511,0.0405 23.76622,-8.37359 24.01453,-21.04416 l 0.43105,-37.46902 7.5978,-1.93195 z"
+           id="path2298"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 577.45461,655.28678 -5.42715,4.20017 20.19894,26.93328 -22.39092,31.11622 5.63499,4.226 21.04365,-28.8967 20.8779,29.58159 5.32727,-4.20103 -22.37578,-31.62866 18.56963,-25.5775 -5.53193,-4.73429 -16.92109,23.66778 z"
+           id="path2300"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         d="m 146.07667,140.34607 c -8.79537,21.56391 -14.10032,35.66923 -23.89281,56.59215 6.00403,6.36425 13.37368,13.77576 25.34198,22.14636 -12.8671,-5.29474 -21.64403,-10.61053 -28.20317,-16.12673 -12.53252,26.15105 -32.167383,63.40203 -72.012843,134.99623 31.317194,-18.07996 55.593723,-29.22646 78.218283,-33.47965 -0.97151,-4.17845 -1.52386,-8.69825 -1.48634,-13.41417 l 0.0372,-1.00328 c 0.49693,-20.06409 10.93425,-35.49338 23.29826,-34.44576 12.36403,1.04761 21.97445,18.17182 21.47753,38.23591 -0.0935,3.77544 -0.51932,7.40735 -1.26338,10.77593 22.37891,4.37771 46.39587,15.49567 77.28933,33.33102 -6.0916,-11.21503 -11.52886,-21.32458 -16.72125,-30.9529 -8.17886,-6.33916 -16.70983,-14.58961 -34.11135,-23.52122 11.9608,3.10792 20.52459,6.69363 27.1999,10.7016 -52.79254,-98.29043 -57.0676,-111.3512 -75.17132,-153.83549 z"
+         id="path2518"
+         style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.18906665"
+         inkscape:connector-curvature="0" />
+      <g
+         id="text2634"
+         style="font-style:normal;font-weight:normal;font-size:8.44138241px;font-family:'DejaVu Sans Mono';fill:#808080;fill-opacity:1;stroke:none"
+         transform="matrix(3.8808,0,0,3.8808,-1673.0935,-734.12067)">
+        <path
+           d="m 685.46692,263.83624 v -5.32944 h -1.99082 v -0.71307 h 4.7895 v 0.71307 h -1.99906 v 5.32944 h -0.79962"
+           id="path3660"
+           style="fill:#808080;fill-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 689.0982,263.83624 v -6.04251 h 1.20355 l 1.43026,4.2784 c 0.13189,0.39843 0.22806,0.69658 0.28852,0.89442 0.0687,-0.21983 0.17586,-0.5427 0.3215,-0.96862 l 1.44674,-4.2042 h 1.07578 v 6.04251 h -0.77077 v -5.05741 l -1.75587,5.05741 h -0.72131 l -1.74763,-5.14396 v 5.14396 h -0.77077"
+           id="path3662"
+           style="fill:#808080;fill-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index 2ea582fb..6f48dd73 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -15,6 +15,10 @@
 /* container for the entire bar */
 #archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; }
 #archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url('archnavbar/archlogo.png') no-repeat !important; }
+@media (-webkit-min-device-pixel-ratio: 1.2), (min--moz-device-pixel-ratio: 1.2), (-o-min-device-pixel-ratio: 2/1) {
+	#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url(archnavbar/archlogo.svg) no-repeat !important;background-size:100% !important; 
+	}
+}
 
 /* move the heading text offscreen */
 #archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
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/base.html b/templates/base.html
index a5e747a8..e44b869c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -23,6 +23,7 @@
                 <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
                 <li id="anb-wiki"><a href="{% wiki_url %}" title="Community documentation">Wiki</a></li>
                 <li id="anb-bugs"><a href="{{ BUGTRACKER_URL }}" title="Report and track bugs">Bugs</a></li>
+                <li id="anb-security"><a href="https://security.archlinux.org/" title="{{ BRANDING_DISTRONAME }} Security Tracker">Security</a></li>
                 <li id="anb-aur"><a href="https://aur.archlinux.org/" title="{{ BRANDING_DISTRONAME }} User Repository">AUR</a></li>
                 <li id="anb-download"><a href="{% url 'page-download' as pdl %}{{ pdl }}" title="Get {{ BRANDING_DISTRONAME }}">Download</a></li>
             </ul>
diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
index 7501a9af..5cf25e80 100644
--- a/templates/mirrors/mirrorlist_generate.html
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -34,7 +34,7 @@
     desired protocol(s).  Simply replace the contents of
     <code>/etc/pacman.d/mirrorlist</code> with your generated list.
     Additionally, the mirror status data can be incorporated into the generated
-    mirror list and used to pre-order the mirrors.</p>
+    mirror list and used to only list up to date mirrors.</p>
 
     <form id="list-generator" method="get">
         {{ mirrorlist_form.as_div }}
diff --git a/templates/mirrors/mirrorlist_status.txt b/templates/mirrors/mirrorlist_status.txt
index 746aae76..34f62cc8 100644
--- a/templates/mirrors/mirrorlist_status.txt
+++ b/templates/mirrors/mirrorlist_status.txt
@@ -5,10 +5,10 @@ forget about where line breaks are happening until you are done getting the
 content right, and then go back later to fix it all up.
 {% endcomment %}{% autoescape off %}##
 ## {{ BRANDING_DISTRONAME }} repository mirrorlist
-## Sorted by mirror score from mirror status page
+## Filtered by mirror score from mirror status page
 ## Generated on {% now "Y-m-d" %}
 ##
 {% for mirror_url in mirror_urls %}
-## Score: {{ mirror_url.score|floatvalue:1|default:'unknown' }}, {{ mirror_url.country.name|default:'Worldwide' }}
+## {{ mirror_url.country.name|default:'Worldwide' }}
 #Server = {{ mirror_url.url}}$repo/os/$arch{% endfor %}
 {% endautoescape %}
diff --git a/templates/releng/archlinux.ipxe b/templates/releng/archlinux.ipxe
index 81767f32..3a7ba973 100644
--- a/templates/releng/archlinux.ipxe
+++ b/templates/releng/archlinux.ipxe
@@ -8,16 +8,14 @@ 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
 menu {{ BRANDING_DISTRONAME }} 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 +27,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 {{ BRANDING_DISTRONAME }} 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 +47,6 @@ reboot
 :exit
 exit
 
-:set_architecture
-menu {{ BRANDING_DISTRONAME }} 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 {{ BRANDING_DISTRONAME }} Netboot: Select Release
 item back back
@@ -124,14 +119,14 @@ echo -n Boot options: ${} && read extrabootoptions ||
 goto main
 
 :boot
-echo Booting {{ BRANDING_DISTRONAME }} ${bootarch} ${release} from ${mirrorurl}
+echo Booting {{ BRANDING_DISTRONAME }} 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