From fe5d6339d8af14bf6837b7280df37266586d904c Mon Sep 17 00:00:00 2001 From: Jannik Schönartz Date: Tue, 23 Mar 2021 20:41:52 +0100 Subject: [server/ipxe_builder] Update embedded ipxe + config --- server/ipxe/embedded.ipxe | 27 +++++++++++++++++++++++---- server/ipxe/general.h | 26 +++++++++++++------------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/server/ipxe/embedded.ipxe b/server/ipxe/embedded.ipxe index cdf1324..810a1ce 100644 --- a/server/ipxe/embedded.ipxe +++ b/server/ipxe/embedded.ipxe @@ -4,10 +4,29 @@ # EMBEDDED SCRIPT # ################### -ifopen -iseq ${platform} pcbios || dhcp || +ifopen || + +iseq ${gateway} ${} || goto loop +iseq ${ip} ${} || goto loop +echo Running DHCP since no IP config was found +dhcp || :loop -chain -ar https://bas.intra.uni-freiburg.de/api/configloader/${uuid} || sleep 5 +chain -ar https://bas.intra.uni-freiburg.de/api/configloader/${uuid} || +# Error check +set error ${errno} +iseq ${error} 0x216eb8f && goto timeerror || +iseq ${error} 0x216ea8f && goto hostnameerror || +sleep 5 dhcp || -goto loop \ No newline at end of file +goto loop + +:timeerror +echo Certificate Issue: +echo Check if your systemtime matches the validity period of the certificate. +prompt Press any key to reboot && reboot + +:hostnameerror +echo Certificate Issue: +echo Your hostname does not match the hostname in the certificate. +prompt Press any key to reboot && reboot \ No newline at end of file diff --git a/server/ipxe/general.h b/server/ipxe/general.h index 5ee8d0e..fe926c9 100644 --- a/server/ipxe/general.h +++ b/server/ipxe/general.h @@ -85,9 +85,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); * 802.11 cryptosystems and handshaking protocols * */ -#define CRYPTO_80211_WEP /* WEP encryption (deprecated and insecure!) */ -#define CRYPTO_80211_WPA /* WPA Personal, authenticating with passphrase */ -#define CRYPTO_80211_WPA2 /* Add support for stronger WPA cryptography */ +//#define CRYPTO_80211_WEP /* WEP encryption (deprecated and insecure!) */ +//#define CRYPTO_80211_WPA /* WPA Personal, authenticating with passphrase */ +//#define CRYPTO_80211_WPA2 /* Add support for stronger WPA cryptography */ /* * Name resolution modules @@ -103,13 +103,13 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); * you want to use. * */ -#define IMAGE_NBI /* NBI image support */ -#define IMAGE_ELF /* ELF image support */ -#define IMAGE_MULTIBOOT /* MultiBoot image support */ -#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_NBI /* NBI image support */ +//#define IMAGE_ELF /* ELF image support */ +//#define IMAGE_MULTIBOOT /* MultiBoot image support */ +//#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_EFI /* EFI image support */ //#define IMAGE_SDI /* SDI image support */ //#define IMAGE_PNM /* PNM image support */ @@ -125,8 +125,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #define NVO_CMD /* Non-volatile option storage commands */ #define CONFIG_CMD /* Option configuration console */ #define IFMGMT_CMD /* Interface management commands */ -#define IWMGMT_CMD /* Wireless interface management commands */ -#define IBMGMT_CMD /* Infiniband management commands */ +//#define IWMGMT_CMD /* Wireless interface management commands */ +//#define IBMGMT_CMD /* Infiniband management commands */ #define FCMGMT_CMD /* Fibre Channel management commands */ #define ROUTE_CMD /* Routing table management commands */ #define IMAGE_CMD /* Image management commands */ @@ -141,7 +141,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); //#define DIGEST_CMD /* Image crypto digest commands */ //#define LOTEST_CMD /* Loopback testing commands */ //#define VLAN_CMD /* VLAN commands */ -#define PXE_CMD /* PXE commands */ +//#define PXE_CMD /* PXE commands */ #define REBOOT_CMD /* Reboot command */ #define POWEROFF_CMD /* Power off command */ //#define IMAGE_TRUST_CMD /* Image trust management commands */ -- cgit v1.2.3-55-g7522