From a25c7f6f67210d6cb1cd6f3a9d7e7dab2dd4f4f2 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 18 Nov 2017 11:36:20 +0100 Subject: [PATCH] modified menu --- src/config/general.h | 2 +- src/embed.ipxe | 4 +-- src/menu.ipxe | 81 ++++++++++++++++++++++++++------------------ 3 files changed, 51 insertions(+), 36 deletions(-) diff --git a/src/config/general.h b/src/config/general.h index b5c1c478..65620d5e 100644 --- a/src/config/general.h +++ b/src/config/general.h @@ -108,7 +108,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); //#define IMAGE_PXE /* PXE image support */ //#define IMAGE_SCRIPT /* iPXE script image support */ //#define IMAGE_BZIMAGE /* Linux bzImage image support */ -//#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ +#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ //#define IMAGE_EFI /* EFI image support */ //#define IMAGE_SDI /* SDI image support */ //#define IMAGE_PNM /* PNM image support */ diff --git a/src/embed.ipxe b/src/embed.ipxe index 2caf72ba..e36476c1 100644 --- a/src/embed.ipxe +++ b/src/embed.ipxe @@ -62,9 +62,9 @@ chain --autofree http://boot.aec.at/menu.ipxe || goto menu exit :stargazer -echo Booting from stargazer.socialnerds.org (tftp://${net0/gateway}/menu.ipxe) +echo Booting from stargazer.socialnerds.org (tftp://10.1.5.1/menu.ipxe) sleep 2 -chain --autofree tftp://${net0/gateway}/menu.ipxe || goto menu +chain --autofree tftp://10.1.5.1/menu.ipxe || goto menu exit :netbootxyz diff --git a/src/menu.ipxe b/src/menu.ipxe index 296171d8..912d847d 100644 --- a/src/menu.ipxe +++ b/src/menu.ipxe @@ -2,7 +2,7 @@ # ipxe menu (stargazer.socialnerds.org) -:dhcp +#:dhcp dhcp net0 || goto dhcp colour --basic 9 4 @@ -12,16 +12,17 @@ colour --basic 6 1 set server_name stargazer.socialnerds.org set server_ip ${net0/gateway} set iscsi_portal 10.1.5.2 +set iqn-discovery-esxi iscsi:${iscsi_portal}::::iqn.2000-01.com.synology:spacedock.discovery-esxi.e84d7761fd +set iqn-ghost-windows81 iscsi:${iscsi_portal}::::iqn.2000-01.com.synology:spacedock.ghost-windows81.e84d7761fd +set iqn-ghost-archlinux iscsi:${iscsi_portal}::::iqn.2000-01.com.synology:spacedock.ghost-archlinux.e84d7761fd +set iqn-ghost-antergos iscsi:${iscsi_portal}::::iqn.2000-01.com.synology:spacedock.ghost-antergos.e84d7761fd -# loading custom ipxe menues -#:custom -#echo Loading custom menu for ${net0/ip} -#chain tftp://${server_ip}/${net0/ip}.ipxe || goto menu -#goto ${net0/ip} -#goto custom +:custom +#iseq ${net0/ip} 10.1.5.4 && goto ${net0/ip} || goto menu +goto ${net0/ip} || goto menu :menu -menu stargazer.socialnerds.org (tftp://${net0/gateway}) +menu stargazer.socialnerds.org item --gap MAC Address: ${net0/mac} item --gap IP Address: ${net0/ip} item --gap Netmask: ${net0/netmask} @@ -29,35 +30,49 @@ item --gap Gateway: ${net0/gateway} item --gap DNS: ${net0/dns} item item -item localboot Boot into SolusOS +item noboot Here be dragons. +item + +choose target && goto ${target} +goto menu + +:windows81 +echo Booting into Windows 8.1 from ISCSI. +set net0/keep-san 1 +sleep 1 +sanboot --keep ${iqn-ghost-windows81} || goto menu + +:archlinux +echo Booting into Archlinux from ISCSI. +set net0/keep-san 1 +sleep 1 +sanboot --keep ${iqn-ghost-archlinux} || goto menu + +:antergos +echo Booting into Antergos from ISCSI. +set net0/keep-san 1 +sleep 1 +sanboot --keep ${iqn-ghost-antergos} || goto menu + +# Custom boot for 10.1.5.4 (discovery_iscsi) +:10.1.5.4 +echo Booting into VMWare ESXi 6.5 from ISCSI. +set net0/keep-san 1 +sanboot --keep ${iqn-discovery-esxi} || goto menu + +# Custom boot for 10.1.5.3 (ghost_iscsi) +:10.1.5.3 +menu stargazer.socialnerds.org +item --gap MAC Address: ${net0/mac} +item --gap IP Address: ${net0/ip} +item --gap Netmask: ${net0/netmask} +item +item item archlinux Boot into Archlinux +item antergos Boot into Antergos item windows81 Boot into Windows 8.1 item choose target && goto ${target} goto menu - -:solusos -echo Booting into SolusOS from local SSD. -sleep 1 -sanboot --no-describe --drive 0x80 || goto menu - -:windows81 -echo Booting into Windows 8.1 from ISCSI. -dhcp net1 || goto windows81 -set net1/gateway 0.0.0.0 -set net1/keep-san 1 -sleep 1 -sanboot --keep iscsi:${iscsi_portal}:::0:ghostwin81 || goto menu -#sanboot --keep iscsi:${iscsi_portal}:::1:iqn.2000-01.com.synology:spacedock.ghost.e84d7761fd || goto menu - -:archlinux -echo Booting into Archlinux from ISCSI. -dhcp net1 || goto archlinux -#set net1/gateway 0.0.0.0 -#set net1/keep-san 1 -sleep 1 -sanboot --keep iscsi:${iscsi_portal}:::0:iqn.2000-01.com.synology:spacedock.ghost.e84d7761fd || goto menu - -