From 8e2e18c25c07681f97a9967d8fdb69f866beccbf Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 9 Jun 2022 15:07:46 +0200
Subject: [minilinux] Add option to force another DHCP request in initramfs

---
 modules-available/minilinux/inc/linuxbootentryhook.inc.php | 7 +++++++
 modules-available/minilinux/lang/de/module.json            | 1 +
 modules-available/minilinux/lang/en/module.json            | 1 +
 3 files changed, 9 insertions(+)

(limited to 'modules-available/minilinux')

diff --git a/modules-available/minilinux/inc/linuxbootentryhook.inc.php b/modules-available/minilinux/inc/linuxbootentryhook.inc.php
index abcb0000..55306d00 100644
--- a/modules-available/minilinux/inc/linuxbootentryhook.inc.php
+++ b/modules-available/minilinux/inc/linuxbootentryhook.inc.php
@@ -21,11 +21,13 @@ class LinuxBootEntryHook extends BootEntryHook
 		 * Dictionary::translate('ipxe-kcl-extra');
 		 * Dictionary::translate('ipxe-debug');
 		 * Dictionary::translate('ipxe-insecure-cpu');
+		 * Dictionary::translate('ipxe-force-init-dhcp');
 		 */
 		return [
 			new HookExtraField('kcl-extra', 'string', ''),
 			new HookExtraField('debug', 'bool', false),
 			new HookExtraField('insecure-cpu', 'bool', false),
+			new HookExtraField('force-init-dhcp', 'bool', false),
 		];
 	}
 
@@ -154,6 +156,11 @@ class LinuxBootEntryHook extends BootEntryHook
 			$exec->commandLine = IPxe::modifyCommandLine($exec->commandLine,
 				'noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off mitigations=off');
 		}
+		// force that we
+		if (!empty($localData['force-init-dhcp'])) {
+			$exec->commandLine = IPxe::modifyCommandLine($exec->commandLine,
+				'-ipv4.ip -ipv4.router -ipv4.dns -ipv4.subnet');
+		}
 		// GVT, PCI Pass-thru etc.
 		if (Module::isAvailable('statistics')) {
 			$hwextra = HardwareInfo::getKclModifications();
diff --git a/modules-available/minilinux/lang/de/module.json b/modules-available/minilinux/lang/de/module.json
index 9cf5c1a1..f8e026b5 100644
--- a/modules-available/minilinux/lang/de/module.json
+++ b/modules-available/minilinux/lang/de/module.json
@@ -6,6 +6,7 @@
     "file-ok": "OK",
     "file-size-mismatch": "Dateigr\u00f6\u00dfe stimmt nicht",
     "ipxe-debug": "Debug-Ausgaben statt Bootlogo",
+    "ipxe-force-init-dhcp": "Erzwinge erneuten DHCP-Request nach Laden des initramfs",
     "ipxe-insecure-cpu": "Alle Mitigations for CPU-Sicherheitsl\u00fccken deaktivieren",
     "ipxe-kcl-extra": "Modifikation der Kernel-Command-Line",
     "latest_of_branch": "(Neueste lokal vorhandene Version)",
diff --git a/modules-available/minilinux/lang/en/module.json b/modules-available/minilinux/lang/en/module.json
index b58c48e2..ff5c7a49 100644
--- a/modules-available/minilinux/lang/en/module.json
+++ b/modules-available/minilinux/lang/en/module.json
@@ -6,6 +6,7 @@
     "file-ok": "OK",
     "file-size-mismatch": "File size mismatch",
     "ipxe-debug": "Print debug messages instead of showing splash screen",
+    "ipxe-force-init-dhcp": "Force another DHCP request after loading initramfs",
     "ipxe-insecure-cpu": "Disable all mitigations for CPU security flaws",
     "ipxe-kcl-extra": "Modifications to the kernel command line",
     "latest_of_branch": "(Latest locally available version)",
-- 
cgit v1.2.3-55-g7522