From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 20 Apr 2023 10:11:32 +0000 (+0200)
Subject: Move --initrd to the Content group
X-Git-Tag: v15~222^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcb83b10dd5c76c9db95e0c0480a8b681adac05b;p=thirdparty%2Fmkosi.git

Move --initrd to the Content group
---

diff --git a/mkosi.md b/mkosi.md
index 76d31dacc..d0ca1f66c 100644
--- a/mkosi.md
+++ b/mkosi.md
@@ -509,12 +509,6 @@ a boolean argument: either "1", "yes", or "true" to enable, or "0",
   in building or further container import stages.  This option strips
   SELinux context attributes from the resulting tar archive.
 
-`Initrd=`, `--initrd`
-
-: Use user-provided initrd(s). Takes a comma separated list of paths to initrd
-  files. This option may be used multiple times in which case the initrd lists
-  are combined.
-
 ### [Content] Section
 
 `Packages=`, `--package=`, `-p`
@@ -774,6 +768,12 @@ a boolean argument: either "1", "yes", or "true" to enable, or "0",
   an `mkosi.nspawn` file found in the local directory it is
   automatically used for this purpose.
 
+`Initrd=`, `--initrd`
+
+: Use user-provided initrd(s). Takes a comma separated list of paths to initrd
+  files. This option may be used multiple times in which case the initrd lists
+  are combined.
+
 `BaseImage=`, `--base-image=`
 
 : Use the specified directory or file system image as the base image,
diff --git a/mkosi/config.py b/mkosi/config.py
index ebb8cc831..16c404f55 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -479,11 +479,6 @@ class MkosiConfigParser:
             parse=config_make_list_parser(delimiter=",", parse=make_path_parser(required=True)),
             paths=("mkosi.repart",),
         ),
-        MkosiConfigSetting(
-            dest="initrds",
-            section="Output",
-            parse=config_make_list_parser(delimiter=",", parse=make_path_parser(required=False)),
-        ),
         MkosiConfigSetting(
             dest="packages",
             section="Content",
@@ -630,6 +625,11 @@ class MkosiConfigParser:
             section="Content",
             parse=config_make_path_parser(required=True),
         ),
+        MkosiConfigSetting(
+            dest="initrds",
+            section="Content",
+            parse=config_make_list_parser(delimiter=",", parse=make_path_parser(required=False)),
+        ),
         MkosiConfigSetting(
             dest="checksum",
             section="Validation",
@@ -1040,13 +1040,6 @@ class MkosiConfigParser:
             dest="repart_dirs",
             action=action,
         )
-        group.add_argument(
-            "--initrd",
-            help="Add a user-provided initrd to image",
-            metavar="PATH",
-            dest="initrds",
-            action=action,
-        )
 
         group = parser.add_argument_group("Content options")
         group.add_argument(
@@ -1212,6 +1205,13 @@ class MkosiConfigParser:
             help='Use the given image as base (e.g. lower sysext layer)',
             action=action,
         )
+        group.add_argument(
+            "--initrd",
+            help="Add a user-provided initrd to image",
+            metavar="PATH",
+            dest="initrds",
+            action=action,
+        )
 
         group = parser.add_argument_group("Validation options")
         group.add_argument(