Set up rpm before dnf/zypper

diff --git a/mkosi/distributions/azure.py b/mkosi/distributions/azure.py
index 77ca1dc9e741c122391b048a50d63a2c74240f39..84df21e1c027bbe4559a618c9c913220f9148177 100644 (file)
--- a/mkosi/distributions/azure.py
+++ b/mkosi/distributions/azure.py
@@ -28,8 +28,8 @@ class Installer(fedora.Installer):
 
     @classmethod
     def setup(cls, context: Context) -> None:
-        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
         setup_rpm(context, dbpath="/var/lib/rpm")
+        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
 
     @classmethod
     def install(cls, context: Context) -> None:

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 75ef35c7169486b0c10a543aa8d0a8abd7c65ad7..bacc2f094d320d244059f8911c13f304bb28374f 100644 (file)
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -65,9 +65,10 @@ class Installer(DistributionInstaller):
         if GenericVersion(context.config.release) <= 8:
             die(f"{cls.pretty_name()} Stream 8 or earlier variants are not supported")
 
+        setup_rpm(context, dbpath=cls.dbpath(context))
+
         Dnf.setup(context, list(cls.repositories(context)))
         (context.sandbox_tree / "etc/dnf/vars/stream").write_text(f"{context.config.release}-stream\n")
-        setup_rpm(context, dbpath=cls.dbpath(context))
 
     @classmethod
     def install(cls, context: Context) -> None:

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index c79302fe84716d9122386895825b77e8864703b9..12f71c061c100e3131ec8008bb4603aabbc6f730 100644 (file)
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -100,8 +100,8 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def setup(cls, context: Context) -> None:
-        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
         setup_rpm(context)
+        Dnf.setup(context, list(cls.repositories(context)), filelists=False)
 
     @classmethod
     def install(cls, context: Context) -> None:

diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index fbbd7b465c6c03f5955b088993f030abb1b664c0..eab65f1ef32e678aa3db79c89d752c5d73d87625 100644 (file)
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -49,14 +49,14 @@ class Installer(DistributionInstaller):
 
     @classmethod
     def setup(cls, context: Context) -> None:
+        setup_rpm(context)
+
         zypper = context.config.find_binary("zypper")
         if zypper:
             Zypper.setup(context, list(cls.repositories(context)))
         else:
             Dnf.setup(context, list(cls.repositories(context)))
 
-        setup_rpm(context)
-
     @classmethod
     def install(cls, context: Context) -> None:
         cls.install_packages(context, ["filesystem"], apivfs=False)