From 897e04c887338db23fbdbe5a0d26aab2e63a6ce4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 12 Sep 2022 10:30:35 +0200
Subject: [minilinux] Update KCL flags

---
 modules-available/minilinux/inc/linuxbootentryhook.inc.php | 4 ++--
 modules-available/minilinux/lang/de/module.json            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules-available/minilinux')

diff --git a/modules-available/minilinux/inc/linuxbootentryhook.inc.php b/modules-available/minilinux/inc/linuxbootentryhook.inc.php
index 55306d00..636f3dfe 100644
--- a/modules-available/minilinux/inc/linuxbootentryhook.inc.php
+++ b/modules-available/minilinux/inc/linuxbootentryhook.inc.php
@@ -154,12 +154,12 @@ class LinuxBootEntryHook extends BootEntryHook
 		// disable all CPU sidechannel attack mitigations etc.
 		if (!empty($localData['insecure-cpu'])) {
 			$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');
+				'noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off mitigations=off i915.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');
+				'-ipv4.router -ipv4.dns -ipv4.subnet');
 		}
 		// GVT, PCI Pass-thru etc.
 		if (Module::isAvailable('statistics')) {
diff --git a/modules-available/minilinux/lang/de/module.json b/modules-available/minilinux/lang/de/module.json
index f8e026b5..0e5dd08e 100644
--- a/modules-available/minilinux/lang/de/module.json
+++ b/modules-available/minilinux/lang/de/module.json
@@ -7,7 +7,7 @@
     "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-insecure-cpu": "Alle Mitigations f\u00fcr CPU-Sicherheitsl\u00fccken deaktivieren",
     "ipxe-kcl-extra": "Modifikation der Kernel-Command-Line",
     "latest_of_branch": "(Neueste lokal vorhandene Version)",
     "menu-sources": "Update-Quellen",
@@ -15,4 +15,4 @@
     "module_name": "Netboot Grundsystem",
     "not_installed_hint": "(nicht installiert)",
     "page_title": "Linuxvarianten f\u00fcr Netboot verwalten"
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-55-g7522