Refactor mirbsd and add to available OS docs

README.md

@@ -44,6 +44,7 @@ Full documentation is at ReadTheDocs:
 * [Kali Linux](https://www.kali.org)
 * [Mageia](http://www.mageia.org)
 * [Manjaro Linux](https://manjaro.github.io)
+* [MirOS](https://www.mirbsd.org)
 * [OpenBSD](http://openbsd.org)
 * [OpenSUSE](http://opensuse.org)
 * [RancherOS](http://rancher.com/rancher-os/)

docs/index.md

@@ -48,6 +48,7 @@ You'll need to make sure to have [DOWNLOAD_PROTO_HTTPS](https://github.com/ipxe/
 * [Kali Linux](https://www.kali.org)
 * [Mageia](http://www.mageia.org)
 * [Manjaro Linux](https://manjaro.github.io)
+* [MirOS](https://www.mirbsd.org)
 * [OpenBSD](http://openbsd.org)
 * [OpenSUSE](http://opensuse.org)
 * [RancherOS](http://rancher.com/rancher-os/)

src/bsd.ipxe

@@ -10,8 +10,8 @@ iseq ${arch} x86_64 && set arch_a amd64 || set arch_a ${arch}
 # BSD based systems
 item --gap BSD Based Operating Systems
 item freebsd ${space} FreeBSD
-item openbsd ${space} OpenBSD
 item mirbsd ${space} MirBSD (i386 only)
+item openbsd ${space} OpenBSD
 
 # Options
 item --gap Options:
@@ -38,12 +38,3 @@ exit 0
 :changebits
 iseq ${arch} x86_64 && set arch i386 || set arch x86_64
 goto bsd_menu
-
-#XXX image signature verification missing, how to add?
-:mirbsd
-imgfree
-kernel https://www.mirbsd.org/MirOS/current/bsd4me.com
-module https://www.mirbsd.org/MirOS/current/bsd4me.rd
-module https://www.mirbsd.org/MirOS/webstuff/netboot.xyz/boot.cfg
-boot
-goto bsd_exit

src/mirbsd.ipxe

@@ -0,0 +1,22 @@
+#!ipxe
+
+# MirOS BSD Operating System
+# https://www.mirbsd.org/
+
+:mirbsd_menu
+menu Please pick a MirOS version
+item mirbsd ${space} MirBSD (i386) Latest
+choose mirbsd_version || goto mirbsd_exit
+goto boot_mirbsd
+
+:boot_mirbsd
+imgfree
+kernel https://www.mirbsd.org/MirOS/current/bsd4me.com
+module https://www.mirbsd.org/MirOS/current/bsd4me.rd
+module https://www.mirbsd.org/MirOS/webstuff/netboot.xyz/boot.cfg
+boot
+goto mirbsd_exit
+
+:mirbsd_exit
+clear menu
+exit 0