From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 26 Jul 2023 13:54:14 +0000 (+0200)
Subject: Set KERNEL_INSTALL_BYPASS=1 in load_environment()
X-Git-Tag: v15~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deaaa831d4379ef400ffdc5f71bc0eabed072044;p=thirdparty%2Fmkosi.git

Set KERNEL_INSTALL_BYPASS=1 in load_environment()
---

diff --git a/mkosi/config.py b/mkosi/config.py
index e3ec78b49..177ea19d8 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2093,6 +2093,7 @@ def load_kernel_command_line_extra(args: argparse.Namespace) -> list[str]:
 def load_environment(args: argparse.Namespace) -> dict[str, str]:
     env = {
         "SYSTEMD_TMPFILES_FORCE_SUBVOL": "0",
+        "KERNEL_INSTALL_BYPASS": "1",
     }
 
     if args.image_id is not None:
diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py
index f2146e082..4102d6876 100644
--- a/mkosi/installer/apt.py
+++ b/mkosi/installer/apt.py
@@ -103,4 +103,4 @@ def invoke_apt(
 ) -> None:
     bwrap(apt_cmd(state) + [operation, *packages],
           apivfs=state.root if apivfs else None,
-          env=dict(KERNEL_INSTALL_BYPASS="1") | state.config.environment)
+          env=state.config.environment)
diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py
index 4efc636e9..decc6c004 100644
--- a/mkosi/installer/dnf.py
+++ b/mkosi/installer/dnf.py
@@ -114,7 +114,7 @@ def dnf_cmd(state: MkosiState) -> list[str]:
 def invoke_dnf(state: MkosiState, command: str, packages: Iterable[str], apivfs: bool = True) -> None:
     bwrap(dnf_cmd(state) + [command] + sort_packages(packages),
           apivfs=state.root if apivfs else None,
-          env=dict(KERNEL_INSTALL_BYPASS="1") | state.config.environment)
+          env=state.config.environment)
 
     fixup_rpmdb_location(state.root)
 
diff --git a/mkosi/installer/pacman.py b/mkosi/installer/pacman.py
index d4c79d5de..b934c199d 100644
--- a/mkosi/installer/pacman.py
+++ b/mkosi/installer/pacman.py
@@ -111,4 +111,4 @@ def pacman_cmd(state: MkosiState) -> list[str]:
 def invoke_pacman(state: MkosiState, packages: Sequence[str], apivfs: bool = True) -> None:
     bwrap(pacman_cmd(state) + ["-Sy"] + sort_packages(packages),
           apivfs=state.root if apivfs else None,
-          env=dict(KERNEL_INSTALL_BYPASS="1") | state.config.environment)
+          env=state.config.environment)
diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py
index a536a1123..4160b06c4 100644
--- a/mkosi/installer/zypper.py
+++ b/mkosi/installer/zypper.py
@@ -68,6 +68,6 @@ def invoke_zypper(
 ) -> None:
     bwrap(zypper_cmd(state) + [verb, *packages, *options],
           apivfs=state.root if apivfs else None,
-          env=dict(KERNEL_INSTALL_BYPASS="1") | state.config.environment)
+          env=state.config.environment)
 
     fixup_rpmdb_location(state.root)