]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Make 9-stream the default for centos and centos_epel
authorDavide Cavalca <dcavalca@fb.com>
Thu, 3 Feb 2022 16:05:09 +0000 (08:05 -0800)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 3 Feb 2022 17:46:27 +0000 (17:46 +0000)
mkosi/__init__.py

index fc5705490628aaa6a41071d78f9339d86080c690..0d9444c8dc071694382a7cb87de7aca4874d84de 100644 (file)
@@ -2599,8 +2599,11 @@ def install_centos(args: MkosiArgs, root: Path, do_run_build_script: bool) -> No
     if do_run_build_script:
         packages.update(args.build_packages)
 
-    if not do_run_build_script and args.distribution == Distribution.centos_epel and args.network_veth:
-        add_packages(args, packages, "systemd-networkd", conditional="systemd")
+    if not do_run_build_script and args.distribution == Distribution.centos_epel:
+        if args.network_veth:
+            add_packages(args, packages, "systemd-networkd", conditional="systemd")
+        if epel_release >= 9:
+            add_packages(args, packages, "systemd-boot", conditional="systemd")
 
     install_packages_dnf(args, root, packages, do_run_build_script)
 
@@ -6200,7 +6203,7 @@ def load_args(args: argparse.Namespace) -> MkosiArgs:
         if args.distribution == Distribution.fedora:
             args.release = "35"
         elif args.distribution in (Distribution.centos, Distribution.centos_epel):
-            args.release = "8-stream"
+            args.release = "9-stream"
         elif args.distribution in (Distribution.rocky, Distribution.rocky_epel):
             args.release = "8"
         elif args.distribution in (Distribution.alma, Distribution.alma_epel):