From 4ab9a64be803f1c96be291d9e30b07ccedfe690b Mon Sep 17 00:00:00 2001 From: Antony Messerli Date: Sat, 27 Feb 2016 18:21:01 -0600 Subject: [PATCH] Update links to consolidated netboot.xyz bootloader - Unfies the bootloader and provides a debug menu. - Can now enter debug menu during initial boot - Sets latest bootloader to 1.04 but allows 1.03 to still work for now --- README.md | 16 +++++++--------- docs/index.md | 16 +++++++--------- src/menu.ipxe | 6 +++--- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 344f4672..7b40feed 100644 --- a/README.md +++ b/README.md @@ -8,15 +8,13 @@ These iPXE disks will automatically load into [boot.netboot.xyz](https://boot.netboot.xyz): -| Type | DHCP Bootloaders | Static Bootloaders | Description | -|------|------------------|--------------------|-------------| -|ISO| [netboot.xyz-dhcp.iso](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.iso)| [netboot.xyz-static.iso](https://boot.netboot.xyz/ipxe/netboot.xyz-static.iso) | Used for CD/DVD, Virtual CDs like DRAC/iLO, VMware, Virtual Box| -|USB| [netboot.xyz-dhcp.usb](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.usb) | [netboot.xyz-static.usb](https://boot.netboot.xyz/ipxe/netboot.xyz-static.usb) | Used for creation of USB Keys| -|Kernel| [netboot.xyz-dhcp.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.lkrn) | [netboot.xyz-static.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz-static.lkrn) | Used for booting from GRUB/EXTLINUX| -|DHCP| [netboot.xyz-dhcp.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.kpxe) | [netboot.xyz-static.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-static.kpxe) | DHCP boot image file, uses built-in iPXE NIC drivers| -|DHCP-undionly|[netboot.xyz-dhcp-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp-undionly.kpxe) | [netboot.xyz-static-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-static-undionly.kpxe) | DHCP boot image file, use if you have NIC issues| - -The DHCP bootloaders will automatically get a network address if you have DHCP on your network while the static bootloaders will prompt you for network information. +| Type | Bootloader | Description | +|------|------------|-------------| +|ISO| [netboot.xyz.iso](https://boot.netboot.xyz/ipxe/netboot.xyz.iso)| Used for CD/DVD, Virtual CDs like DRAC/iLO, VMware, Virtual Box| +|USB| [netboot.xyz.usb](https://boot.netboot.xyz/ipxe/netboot.xyz.usb)| Used for creation of USB Keys| +|Kernel| [netboot.xyz.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz.lkrn)| Used for booting from GRUB/EXTLINUX| +|DHCP| [netboot.xyz.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz.kpxe)| DHCP boot image file, uses built-in iPXE NIC drivers| +|DHCP-undionly | [netboot.xyz-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-undionly.kpxe)| DHCP boot image file, use if you have NIC issues| SHA256 checksums are generated during each build of iPXE and are located [here](https://boot.netboot.xyz/ipxe/netboot.xyz-sha256-checksums.txt). You can also view the scripts that are embedded into the images [here](https://github.com/antonym/netboot.xyz/tree/master/ipxe/disks). diff --git a/docs/index.md b/docs/index.md index e6d4a5f6..c9522dc5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -7,15 +7,13 @@ These iPXE disks will automatically load into [boot.netboot.xyz](https://boot.netboot.xyz): -| Type | DHCP Bootloaders | Static Bootloaders | Description | -|------|------------------|--------------------|-------------| -|ISO| [netboot.xyz-dhcp.iso](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.iso)| [netboot.xyz-static.iso](https://boot.netboot.xyz/ipxe/netboot.xyz-static.iso) | Used for CD/DVD, Virtual CDs like DRAC/iLO, VMware, Virtual Box| -|USB| [netboot.xyz-dhcp.usb](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.usb) | [netboot.xyz-static.usb](https://boot.netboot.xyz/ipxe/netboot.xyz-static.usb) | Used for creation of USB Keys| -|Kernel| [netboot.xyz-dhcp.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.lkrn) | [netboot.xyz-static.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz-static.lkrn) | Used for booting from GRUB/EXTLINUX| -|DHCP| [netboot.xyz-dhcp.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp.kpxe) | [netboot.xyz-static.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-static.kpxe) | DHCP boot image file, uses built-in iPXE NIC drivers| -|DHCP-undionly|[netboot.xyz-dhcp-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-dhcp-undionly.kpxe) | [netboot.xyz-static-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-static-undionly.kpxe) | DHCP boot image file, use if you have NIC issues| - -The DHCP bootloaders will automatically get a network address if you have DHCP on your network while the static bootloaders will prompt you for network information. +| Type | Bootloader | Description | +|------|------------|-------------| +|ISO| [netboot.xyz.iso](https://boot.netboot.xyz/ipxe/netboot.xyz.iso)| Used for CD/DVD, Virtual CDs like DRAC/iLO, VMware, Virtual Box| +|USB| [netboot.xyz.usb](https://boot.netboot.xyz/ipxe/netboot.xyz.usb)| Used for creation of USB Keys| +|Kernel| [netboot.xyz.lkrn](https://boot.netboot.xyz/ipxe/netboot.xyz.lkrn)| Used for booting from GRUB/EXTLINUX| +|DHCP| [netboot.xyz.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz.kpxe)| DHCP boot image file, uses built-in iPXE NIC drivers| +|DHCP-undionly | [netboot.xyz-undionly.kpxe](https://boot.netboot.xyz/ipxe/netboot.xyz-undionly.kpxe)| DHCP boot image file, use if you have NIC issues| SHA256 checksums are generated during each build of iPXE and are located [here](https://boot.netboot.xyz/ipxe/netboot.xyz-sha256-checksums.txt). You can also view the scripts that are embedded into the images [here](https://github.com/antonym/netboot.xyz/tree/master/ipxe/disks). diff --git a/src/menu.ipxe b/src/menu.ipxe index b33dbae4..59bb8e41 100644 --- a/src/menu.ipxe +++ b/src/menu.ipxe @@ -9,9 +9,9 @@ set cls ${cls:string} :ignore_cls :version_check -set latest_version 1.03 +set latest_version 1.04 echo ${cls} -iseq ${version} 1.04 && goto version_up2date || +iseq ${version} 1.03 && goto version_up2date || iseq ${version} ${latest_version} && goto version_up2date || echo echo Updated version of netboot.xyz is available: @@ -22,7 +22,7 @@ echo echo Please download the latest version from netboot.xyz. echo echo Attempting to chain to latest version... -chain --autofree http://${boot_domain}/ipxe/netboot.xyz-dhcp-undionly.kpxe || +chain --autofree http://${boot_domain}/ipxe/netboot.xyz-undionly.kpxe || :version_up2date isset ${arch} && goto skip_arch_detect ||