From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 13 Oct 2023 12:30:18 +0000 (+0200)
Subject: Make sure shadow-utils is installed in tools trees
X-Git-Tag: v19~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0c3be18a3a731b3b598947758243bd16a492aa7;p=thirdparty%2Fmkosi.git

Make sure shadow-utils is installed in tools trees

This provides newuidmap/newgidmap which are used by virtiofsd, so
let's make sure these are available.
---

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index 1767eb11d..35644e1ae 100644
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -57,6 +57,7 @@ class Installer(DistributionInstaller):
             "python-cryptography",
             "qemu-base",
             "sbsigntools",
+            "shadow",
             "socat",
             "squashfs-tools",
             "strace",
diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 34121c108..320d4c047 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -79,6 +79,7 @@ class Installer(DistributionInstaller):
             "pesign",
             "python3-cryptography",
             "qemu-kvm-core",
+            "shadow-utils",
             "socat",
             "squashfs-tools",
             "strace",
diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index b9b62a519..2194c0082 100644
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -71,6 +71,7 @@ class Installer(DistributionInstaller):
             "systemd-container",
             "systemd",
             "tar",
+            "uidmap",
             "util-linux",
             "xfsprogs",
             "xz-utils",
diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 568fb6c4b..04198e48b 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -58,6 +58,7 @@ class Installer(DistributionInstaller):
             "python3-cryptography",
             "qemu-kvm-core",
             "sbsigntools",
+            "shadow-utils",
             "socat",
             "squashfs-tools",
             "strace",
diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index a8337db0e..8cb8f1ed5 100644
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -57,6 +57,7 @@ class Installer(DistributionInstaller):
             "pesign",
             "qemu-headless",
             "sbsigntools",
+            "shadow",
             "socat",
             "squashfs",
             "strace",