5 files changed, 57 insertions, 13 deletions
diff --git a/templates/public/donate.html b/templates/public/donate.html
index ef80baea..301bd1c0 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -44,13 +44,6 @@
         title="velocity network"><img width="252" height="58" src="{% static "vnet_button.png" %}" class="sponsor-btn-vnet"
         title="" alt="velocity network - it's about time" /></a>
 
-    <p>More thanks go to <a href="http://www.airvm.com/ArchLinux"
-        title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
-
-    <a href="http://www.airvm.com/ArchLinux"
-        title="AirVM.com - Your Green Technology Partner"><img width="252" height="58" src="{% static "airvm_button.png" %}"
-        class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
-
     <p>We would also like to thank Kartenzia for sponsoring a dedicated Arch Linux Server.
     Kartenzia.de is a new Start-Up based in Germany and specializes in
     eco-friendly invitations like <a href="http://www.kartenzia.de/weihnachtskarten/">Weihnachten</a>.</p>
diff --git a/templates/public/download.html b/templates/public/download.html
index cbd7cd73..9116816d 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -68,8 +68,8 @@
 
     <p>If you have a wired connection, you can boot the latest release directly over the network.</p>
     <ul>
-        <li><a href="{{ releng_pxeboot_url }}"
-            title="Arch Linux Netboot Live System">Arch Linux Netboot</a></li>
+        <li><a href="{% url 'releng-netboot-info' %}"
+            title="Arch Linux Netboot">Arch Linux Netboot</a></li>
     </ul>
 
     <h3>HTTP Direct Downloads</h3>
diff --git a/templates/public/index.html b/templates/public/index.html
index 5fc4833a..fdb136cf 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -201,9 +201,6 @@
     <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network">
         <img width="252" height="58" src="{% static "vnet_button.png" %}" alt="Velocity Network - It's about time" />
     </a>
-    <a href="http://www.airvm.com/ArchLinux" title="AirVM.com - Your Green Technology Partner">
-        <img width="252" height="58" src="{% static "airvm_button.png" %}" alt="AirVM.com - Your Green Technology Partner" />
-    </a>
 </div>
 {% endcache %}
 {% endblock %}
diff --git a/templates/releng/archlinux.ipxe b/templates/releng/archlinux.ipxe
index 87f9c83b..4945868c 100644
--- a/templates/releng/archlinux.ipxe
+++ b/templates/releng/archlinux.ipxe
@@ -11,7 +11,7 @@ imgtrust
 set bootarch ${cpuarch}
 set release {{ releases.0 }}
 set mirrorurl
-set extrabootoptions ip=dhcp
+set extrabootoptions ip=dhcp net.ifnames=0
 set countrycode
 
 :main
diff --git a/templates/releng/netboot.html b/templates/releng/netboot.html
new file mode 100644
index 00000000..36404588
--- /dev/null
+++ b/templates/releng/netboot.html
@@ -0,0 +1,54 @@
+{% extends "base.html" %}
+{% load staticfiles %}
+
+{% block title %}Arch Linux - Netboot{% endblock %}
+
+{% block content %}
+<div id="arch-netboot" class="box">
+
+<h2>Arch Linux Netboot</h2>
+
+<h3>About Netboot</h3>
+
+<p>Netboot images are small (&lt;1MB) images that can be used to download the latest Arch Linux release on the fly upon system boot.
+It is unnecessary to update the netboot image, the newest release will be available automatically.</p>
+
+<p>Netboot uses customized <a href="http://ipxe.org">iPXE</a> builds.
+The Linux kernel, initramfs and squashfs files for the live system are downloaded from an Arch Linux mirror.
+The integrity of all downloaded files is verified with cryptographic signatures.</p>
+
+<h3>Requirements</h3>
+
+<p>To use netboot, the following requirements must be met:
+
+<ul>
+<li>Wired (ethernet) internet connection with DHCP autoconfiguration</li>
+<li>Sufficient memory to store and run the live system</li>
+</ul>
+
+</p>
+
+<h3>Download</h3>
+
+<h4>BIOS</h4>
+
+<ul>
+<li><a href="{% static "netboot/ipxe.lkrn" %}">ipxe.lkrn</a> (<a href="{% static "netboot/ipxe.lkrn.sig" %}">PGP signature</a>) - Linux kernel-like image that can be started with any Linux bootloader</li>
+<li><a href="{% static "netboot/ipxe.pxe" %}">ipxe.pxe</a> (<a href="{% static "netboot/ipxe.pxe.sig" %}">PGP signature</a>) - PXE image for chainloading from a PXE environment</li>
+</ul>
+
+<h4>UEFI</h4>
+
+<ul>
+<li><a href="{% static "netboot/ipxe.efi" %}">ipxe.efi</a> (<a href="{% static "netboot/ipxe.efi.sig" %}">PGP signature</a>) - x86_64 UEFI executable</li>
+</ul>
+
+<p>You can build your own iPXE images compatible with netboot.
+For details, check out the <a href="https://aur.archlinux.org/packages/ipxe-netboot">ipxe-netboot AUR package</a>.</p>
+
+<h3>More information</h3>
+
+<p>For detailed usage instructions, check out the <a href="https://wiki.archlinux.org/index.php/Netboot">netboot wiki page</a>.
+
+</div>
+{% endblock %}