From fb79c1b578417c3e52b5de880fc808734b7c3b74 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 28 Oct 2019 17:39:38 +0100 Subject: [SSPS] Update ipxe install (own repo, no more patching) --- satellit_installer/includes/10-install_ipxe.inc | 9 +-- satellit_installer/static_files/ipxe.patch | 83 ------------------------- 2 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 satellit_installer/static_files/ipxe.patch diff --git a/satellit_installer/includes/10-install_ipxe.inc b/satellit_installer/includes/10-install_ipxe.inc index 2a5afd7..f25b88f 100644 --- a/satellit_installer/includes/10-install_ipxe.inc +++ b/satellit_installer/includes/10-install_ipxe.inc @@ -1,14 +1,7 @@ install_ipxe() { [ -z "$1" ] && perror "Call install_ipxe with target directory!" - # chr 20160602: Kein --depth wg. commit-ID fuer Patch - # git clone --depth 1 git://git.ipxe.org/ipxe.git "$1" || perror "Cloning ipxe repo failed" - git clone git://git.ipxe.org/ipxe.git "$1" || perror "Cloning ipxe repo failed" - cd "$1" - git reset --hard 936657832f2262ad04bdf16b9229ce0b1d1c174f - git apply --ignore-whitespace < "${BASEDIR}/static_files/ipxe.patch" || perror "Could not patch ipxe compile-time configuration" - cd - > /dev/null - wget -O "$1/pxelinux.0" "$HTTP_BASE/pxelinux.0" || perror "Could not download pxelinux 4 from $HTTP_BASE" + git clone --branch openslx https://git.openslx.org/openslx-ng/ipxe.git "$1" || perror "Cloning ipxe repo failed" # Symlink for USB-Stick HTTP access mkdir -p "$WWWDIR" ln -s -f "$TFTPDIR" "$WWWDIR/tftp" || perror "Could not create symlink for tftp dir" diff --git a/satellit_installer/static_files/ipxe.patch b/satellit_installer/static_files/ipxe.patch deleted file mode 100644 index 56c01ae..0000000 --- a/satellit_installer/static_files/ipxe.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/src/config/branding.h b/src/config/branding.h -index 73f00af..7a30111 100644 ---- a/src/config/branding.h -+++ b/src/config/branding.h -@@ -24,7 +24,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); - * "iPXE". - * - */ --#define PRODUCT_NAME "" -+#define PRODUCT_NAME "OpenSLX iPXE+PXELINUX4 Hybrid" - #define PRODUCT_SHORT_NAME "iPXE" - #define PRODUCT_URI "http://ipxe.org" - -diff --git a/src/config/console.h b/src/config/console.h -index 9f770d0..a4f7b60 100644 ---- a/src/config/console.h -+++ b/src/config/console.h -@@ -53,7 +53,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); - //#define CONSOLE_PC_KBD /* Direct access to PC keyboard */ - - /* Keyboard map (available maps in hci/keymap/) */ --#define KEYBOARD_MAP us -+#define KEYBOARD_MAP de - - /* Control which syslog() messages are generated. - * -diff --git a/src/config/general.h b/src/config/general.h -index ee15f6b..da39a1a 100644 ---- a/src/config/general.h -+++ b/src/config/general.h -@@ -65,11 +65,11 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); - * - */ - --//#undef SANBOOT_PROTO_ISCSI /* iSCSI protocol */ --//#undef SANBOOT_PROTO_AOE /* AoE protocol */ --//#undef SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */ --//#undef SANBOOT_PROTO_FCP /* Fibre Channel protocol */ --//#undef SANBOOT_PROTO_HTTP /* HTTP SAN protocol */ -+#undef SANBOOT_PROTO_ISCSI /* iSCSI protocol */ -+#undef SANBOOT_PROTO_AOE /* AoE protocol */ -+#undef SANBOOT_PROTO_IB_SRP /* Infiniband SCSI RDMA protocol */ -+#undef SANBOOT_PROTO_FCP /* Fibre Channel protocol */ -+#undef SANBOOT_PROTO_HTTP /* HTTP SAN protocol */ - - /* - * HTTP extensions -@@ -81,9 +81,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 */ -+#undef CRYPTO_80211_WEP /* WEP encryption (deprecated and insecure!) */ -+#undef CRYPTO_80211_WPA /* WPA Personal, authenticating with passphrase */ -+#undef CRYPTO_80211_WPA2 /* Add support for stronger WPA cryptography */ - - /* - * Name resolution modules -@@ -124,16 +124,16 @@ 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 */ -+#undef IWMGMT_CMD /* Wireless interface management commands */ - #define IBMGMT_CMD /* Infiniband management commands */ --#define FCMGMT_CMD /* Fibre Channel management commands */ -+#undef FCMGMT_CMD /* Fibre Channel management commands */ - #define ROUTE_CMD /* Routing table management commands */ - #define IMAGE_CMD /* Image management commands */ - #define DHCP_CMD /* DHCP management commands */ --#define SANBOOT_CMD /* SAN boot commands */ -+#undef SANBOOT_CMD /* SAN boot commands */ - #define MENU_CMD /* Menu commands */ --#define LOGIN_CMD /* Login command */ --#define SYNC_CMD /* Sync command */ -+#undef LOGIN_CMD /* Login command */ -+#undef SYNC_CMD /* Sync command */ - //#define NSLOOKUP_CMD /* DNS resolving command */ - //#define TIME_CMD /* Time commands */ - //#define DIGEST_CMD /* Image crypto digest commands */ - -- cgit v1.2.3-55-g7522