From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 10 Sep 2024 09:39:45 +0000 (+0200)
Subject: Drop InitrdInclude=
X-Git-Tag: v25~308^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fa1638a46384dcabb7870ebc6df9390efe2ecef;p=thirdparty%2Fmkosi.git

Drop InitrdInclude=
---

diff --git a/NEWS.md b/NEWS.md
index c8c15a0a8..d85e4d2cc 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -39,6 +39,9 @@
 - Note to packagers: The manual pages have been moved to resources/man
   and now include man pages for mkosi-initrd and mkosi-sandbox as
   well.
+- `InitrdInclude=` was removed. If you're using `InitrdInclude=`, please
+  build your initrd via a subimage in `mkosi.images` containing
+  `Include=mkosi-initrd` and any customizations you wish to add.
 
 ## v24
 
diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 9bcf20b22..962187351 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1195,13 +1195,9 @@ def finalize_default_initrd(
         *(["--proxy-client-key", str(p)] if (p := config.proxy_client_key) else []),
         "--selinux-relabel", str(relabel),
         *(["-f"] * args.force),
+        "--include=mkosi-initrd",
     ]
 
-    cmdline += ["--include=mkosi-initrd"]
-
-    for include in config.initrd_include:
-        cmdline += ["--include", os.fspath(include)]
-
     _, [config] = parse_config(cmdline + ["build"], resources=resources)
 
     run_configure_scripts(config)
diff --git a/mkosi/config.py b/mkosi/config.py
index c59703345..e3557ec05 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -1423,7 +1423,6 @@ class Config:
     profile: Optional[str]
     files: list[Path]
     include: list[Path]
-    initrd_include: list[Path]
     dependencies: list[str]
     minimum_version: Optional[GenericVersion]
     pass_environment: list[str]
@@ -1887,12 +1886,6 @@ SETTINGS = (
         ),
         help="Include configuration from the specified file or directory",
     ),
-    ConfigSetting(
-        dest="initrd_include",
-        section="Config",
-        parse=config_make_list_parser(delimiter=",", reset=False, parse=make_path_parser()),
-        help="Include configuration from the specified file or directory when building the initrd",
-    ),
     ConfigSetting(
         dest="profile",
         section="Config",
@@ -4162,7 +4155,6 @@ def summary(config: Config) -> str:
     {bold("CONFIG")}:
                             Profile: {none_to_none(config.profile)}
                             Include: {line_join_list(config.include)}
-                     Initrd Include: {line_join_list(config.initrd_include)}
                        Dependencies: {line_join_list(config.dependencies)}
                     Minimum Version: {none_to_none(config.minimum_version)}
                   Configure Scripts: {line_join_list(config.configure_scripts)}
diff --git a/mkosi/resources/man/mkosi.md b/mkosi/resources/man/mkosi.md
index c78db5268..269cdaa68 100644
--- a/mkosi/resources/man/mkosi.md
+++ b/mkosi/resources/man/mkosi.md
@@ -1812,10 +1812,6 @@ config file is read:
     Note: Include names starting with either of the literals `mkosi-` or
     `contrib-` are reserved for use by mkosi itself.
 
-`InitrdInclude=`, `--initrd-include=`
-:   Same as `Include=`, but the extra configuration files or directories
-    are included when building the default initrd.
-
 `Dependencies=`, `--dependency=`
 :   The images that this image depends on specified as a comma-separated
     list. All images configured in this option will be built before this
diff --git a/tests/test_json.py b/tests/test_json.py
index 72c36a74a..a45375504 100644
--- a/tests/test_json.py
+++ b/tests/test_json.py
@@ -148,9 +148,6 @@ def test_config() -> None:
             "ImageVersion": "5",
             "Include": [],
             "Incremental": false,
-            "InitrdInclude": [
-                "/foo/bar"
-            ],
             "InitrdPackages": [
                 "clevis"
             ],
@@ -403,7 +400,6 @@ def test_config() -> None:
         image_version="5",
         include=[],
         incremental=False,
-        initrd_include=[Path("/foo/bar"),],
         initrd_packages=["clevis"],
         initrd_volatile_packages=["abc"],
         initrds=[Path("/efi/initrd1"), Path("/efi/initrd2")],