From a51e96cd6029a3d61b29ca21398a04d699f639d3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 11 May 2022 14:09:09 +0200
Subject: [SSUS] Move iPXE config around

---
 .../opt/openslx/ipxe-bwlp-config/console.h         |  4 +++
 .../opt/openslx/ipxe-bwlp-config/general.h         | 32 ++++++++++++++++++++++
 .../opt/openslx/ipxe-bwlp-config/settings.h        |  9 ++++++
 .../openslx/ipxe/src/config/local/bwlp/console.h   |  4 ---
 .../openslx/ipxe/src/config/local/bwlp/general.h   | 32 ----------------------
 .../openslx/ipxe/src/config/local/bwlp/settings.h  |  9 ------
 satellit_upgrader/updater.template.sh              |  2 ++
 7 files changed, 47 insertions(+), 45 deletions(-)
 create mode 100644 satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/console.h
 create mode 100644 satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/general.h
 create mode 100644 satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/settings.h
 delete mode 100644 satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/console.h
 delete mode 100644 satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/general.h
 delete mode 100644 satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/settings.h

diff --git a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/console.h b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/console.h
new file mode 100644
index 0000000..40659e0
--- /dev/null
+++ b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/console.h
@@ -0,0 +1,4 @@
+#ifndef CONSOLE_FRAMEBUFFER
+#define CONSOLE_FRAMEBUFFER
+#endif
+#undef CONSOLE_SERIAL
diff --git a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/general.h b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/general.h
new file mode 100644
index 0000000..f89c9bc
--- /dev/null
+++ b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/general.h
@@ -0,0 +1,32 @@
+#undef NET_PROTO_STP
+#undef NET_PROTO_LACP
+#ifndef DOWNLOAD_PROTO_HTTPS
+#define DOWNLOAD_PROTO_HTTPS
+#endif
+
+#undef CRYPTO_80211_WEP 
+#undef CRYPTO_80211_WPA 
+#undef CRYPTO_80211_WPA2
+
+#undef IWMGMT_CMD
+#undef IBMGMT_CMD
+#undef FCMGMT_CMD
+
+#ifndef REBOOT_CMD
+#define REBOOT_CMD
+#endif
+#ifndef POWEROFF_CMD
+#define POWEROFF_CMD
+#endif
+#ifndef PARAM_CMD
+#define PARAM_CMD
+#endif
+#ifndef CONSOLE_CMD
+#define CONSOLE_CMD
+#endif
+#ifndef MENU_CMD
+#define MENU_CMD
+#endif
+#ifndef LOGIN_CMD
+#define LOGIN_CMD
+#endif
diff --git a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/settings.h b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/settings.h
new file mode 100644
index 0000000..309780f
--- /dev/null
+++ b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe-bwlp-config/settings.h
@@ -0,0 +1,9 @@
+#ifndef CPUID_SETTINGS
+#define CPUID_SETTINGS
+#endif
+#ifndef VRAM_SETTINGS
+#define VRAM_SETTINGS
+#endif
+#ifndef ACPI_SETTINGS
+#define ACPI_SETTINGS
+#endif
diff --git a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/console.h b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/console.h
deleted file mode 100644
index 40659e0..0000000
--- a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/console.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef CONSOLE_FRAMEBUFFER
-#define CONSOLE_FRAMEBUFFER
-#endif
-#undef CONSOLE_SERIAL
diff --git a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/general.h b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/general.h
deleted file mode 100644
index f89c9bc..0000000
--- a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/general.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#undef NET_PROTO_STP
-#undef NET_PROTO_LACP
-#ifndef DOWNLOAD_PROTO_HTTPS
-#define DOWNLOAD_PROTO_HTTPS
-#endif
-
-#undef CRYPTO_80211_WEP 
-#undef CRYPTO_80211_WPA 
-#undef CRYPTO_80211_WPA2
-
-#undef IWMGMT_CMD
-#undef IBMGMT_CMD
-#undef FCMGMT_CMD
-
-#ifndef REBOOT_CMD
-#define REBOOT_CMD
-#endif
-#ifndef POWEROFF_CMD
-#define POWEROFF_CMD
-#endif
-#ifndef PARAM_CMD
-#define PARAM_CMD
-#endif
-#ifndef CONSOLE_CMD
-#define CONSOLE_CMD
-#endif
-#ifndef MENU_CMD
-#define MENU_CMD
-#endif
-#ifndef LOGIN_CMD
-#define LOGIN_CMD
-#endif
diff --git a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/settings.h b/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/settings.h
deleted file mode 100644
index 309780f..0000000
--- a/satellit_installer/static_files/ipxe-bwlp/opt/openslx/ipxe/src/config/local/bwlp/settings.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CPUID_SETTINGS
-#define CPUID_SETTINGS
-#endif
-#ifndef VRAM_SETTINGS
-#define VRAM_SETTINGS
-#endif
-#ifndef ACPI_SETTINGS
-#define ACPI_SETTINGS
-#endif
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index 1471e99..19997c0 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -433,6 +433,8 @@ if $build; then
 		|| pwarning "Could not update iPXE -- let's hope the old version still works."
 	echo "Adding bwlp config..."
 	install_files "ipxe-bwlp"
+	mkdir -p "/opt/openslx/ipxe/src/config/local/bwlp"
+	cp /opt/openslx/ipxe-bwlp-config/*.h "/opt/openslx/ipxe/src/config/local/bwlp/"
 	fixperms "$PATH_IPXE" taskmanager:taskmanager
 	echo "Resetting pxe menu"
 	mysql -e 'UPDATE openslx.property SET value = "invalid" WHERE name = "server-ip"' || pwarning "Could not reset pxe menu status; manual regeneration of menu required"
-- 
cgit v1.2.3-55-g7522