Set KERNEL_INSTALL_BYPASS=1 in load_environment()

diff --git a/mkosi/config.py b/mkosi/config.py
index e3ec78b49ab85ad3beac3e50b403dcd976ea0fe8..177ea19d8558d1a7704e933dcecc83ed9ad9ee1e 100644 (file)
--- 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 f2146e0823ca7e449dc78fb6f07890729d44bf40..4102d68767c0d46aba2cfea05ad259fcb5fbe10b 100644 (file)
--- 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 4efc636e90c540b1fe67857b0037b69ccd26cdaa..decc6c004f8c148a9d855c19391dee6ba086eb36 100644 (file)
--- 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 d4c79d5dedafc8ac5007b580c6737e0a2b0cfff5..b934c199d95503eb12d75f5d1c399044057db568 100644 (file)
--- 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 a536a1123667bb7d4d0c2be386c80bc5ea5fb610..4160b06c4e189d63f5835dcd030cccbf63a9e2ed 100644 (file)
--- 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)