From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 21 Apr 2024 18:20:58 +0000 (+0200)
Subject: fedora: Install basesystem package instead of filesystem
X-Git-Tag: v23.1~102^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bddb83283825d609bc9c1117fde8db6c2a71e15d;p=thirdparty%2Fmkosi.git

fedora: Install basesystem package instead of filesystem

basesystem pulls in filesystem and setup. The latter defines some
common groups and directories that are expected to be available
on every system.

Fedora/CentOS also define basesystem as a package that's expected
to be installed everywhere, so let's make sure our images satisfy
that requirement.
---

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 1a4f84654..115422540 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -80,7 +80,7 @@ class Installer(DistributionInstaller):
     @classmethod
     def install(cls, context: Context) -> None:
         # Make sure glibc-minimal-langpack is installed instead of glibc-all-langpacks.
-        cls.install_packages(context, ["filesystem", "glibc-minimal-langpack"], apivfs=False)
+        cls.install_packages(context, ["basesystem", "glibc-minimal-langpack"], apivfs=False)
 
     @classmethod
     def install_packages(cls, context: Context, packages: Sequence[str], apivfs: bool = True) -> None:
diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 3e8023b9b..90b13103f 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -85,7 +85,7 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def install(cls, context: Context) -> None:
-        cls.install_packages(context, ["filesystem"], apivfs=False)
+        cls.install_packages(context, ["basesystem"], apivfs=False)
 
     @classmethod
     def install_packages(cls, context: Context, packages: Sequence[str], apivfs: bool = True) -> None:
diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py
index 117964b21..c72eac202 100644
--- a/mkosi/distributions/mageia.py
+++ b/mkosi/distributions/mageia.py
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
-from collections.abc import Iterable, Sequence
+from collections.abc import Iterable
 
 from mkosi.config import Architecture
 from mkosi.context import Context
@@ -28,8 +28,8 @@ class Installer(fedora.Installer):
         return Distribution.mageia
 
     @classmethod
-    def install_packages(cls, context: Context, packages: Sequence[str], apivfs: bool = True) -> None:
-        super().install_packages(context, packages, apivfs)
+    def install(cls, context: Context) -> None:
+        cls.install_packages(context, ["filesystem"], apivfs=False)
 
     @classmethod
     @listify
diff --git a/mkosi/distributions/openmandriva.py b/mkosi/distributions/openmandriva.py
index 5e62353d5..47e7497fd 100644
--- a/mkosi/distributions/openmandriva.py
+++ b/mkosi/distributions/openmandriva.py
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
-from collections.abc import Iterable, Sequence
+from collections.abc import Iterable
 
 from mkosi.config import Architecture
 from mkosi.context import Context
@@ -28,8 +28,8 @@ class Installer(fedora.Installer):
         return Distribution.openmandriva
 
     @classmethod
-    def install_packages(cls, context: Context, packages: Sequence[str], apivfs: bool = True) -> None:
-        super().install_packages(context, packages, apivfs)
+    def install(cls, context: Context) -> None:
+        cls.install_packages(context, ["filesystem"], apivfs=False)
 
     @classmethod
     @listify