From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 22 Feb 2023 12:04:46 +0000 (+0100)
Subject: mkosi: add some really basic tools to default mkosi image
X-Git-Tag: v254-rc1~1143^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b65a4aec052dcebdc70fa3f958fc71e49cf30ed2;p=thirdparty%2Fsystemd.git

mkosi: add some really basic tools to default mkosi image

"passwd" and "pscap" are extremely useful to debug basic OS behaviour,
and tiny. So let's add them to our default development images, just to
save us some headaches.
---

diff --git a/mkosi.conf.d/arch/10-arch.conf b/mkosi.conf.d/arch/10-arch.conf
index ee51396e048..a1bff770969 100644
--- a/mkosi.conf.d/arch/10-arch.conf
+++ b/mkosi.conf.d/arch/10-arch.conf
@@ -32,6 +32,7 @@ Packages=
         popt
         python-pefile
         quota-tools
+        shadow
         tpm2-tss
         vim
 
diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/centos/10-centos.conf
index 94aeaed9c9c..91099a7f0a1 100644
--- a/mkosi.conf.d/centos/10-centos.conf
+++ b/mkosi.conf.d/centos/10-centos.conf
@@ -28,6 +28,7 @@ Packages=
         libasan
         libbpf
         libcap-ng
+        libcap-ng-utils
         libfido2
         libmicrohttpd
         libmnl
@@ -38,6 +39,7 @@ Packages=
         numactl-libs
         p11-kit
         pam
+        passwd
         polkit
         popt
         procps-ng
diff --git a/mkosi.conf.d/debian/10-debian.conf b/mkosi.conf.d/debian/10-debian.conf
index 905378a9b4a..0712a70bea7 100644
--- a/mkosi.conf.d/debian/10-debian.conf
+++ b/mkosi.conf.d/debian/10-debian.conf
@@ -20,6 +20,7 @@ Packages=
         libasound2
         libbpf1
         libc6-i386
+        libcap-ng-utils
         libcap-ng0
         libfido2-1
         libglib2.0-0
@@ -35,6 +36,7 @@ Packages=
         libqrencode4
         libtss2-dev # Use the -dev package to avoid churn in updating version numbers
         netcat-openbsd
+        passwd
         policykit-1
         procps
         python3-pefile
diff --git a/mkosi.conf.d/fedora/10-fedora.conf b/mkosi.conf.d/fedora/10-fedora.conf
index 5d4959ba168..5c85eebc03c 100644
--- a/mkosi.conf.d/fedora/10-fedora.conf
+++ b/mkosi.conf.d/fedora/10-fedora.conf
@@ -24,6 +24,7 @@ Packages=
         libasan
         libbpf
         libcap-ng
+        libcap-ng-utils
         libfido2
         libgcrypt
         libmicrohttpd
@@ -34,6 +35,7 @@ Packages=
         netcat
         numactl-libs
         pam
+        passwd
         polkit
         popt
         procps-ng
diff --git a/mkosi.conf.d/opensuse/10-opensuse.conf b/mkosi.conf.d/opensuse/10-opensuse.conf
index 6034b8a87e0..3b0a643efd2 100644
--- a/mkosi.conf.d/opensuse/10-opensuse.conf
+++ b/mkosi.conf.d/opensuse/10-opensuse.conf
@@ -18,6 +18,7 @@ Packages=
         glibc-locale-base
         libasound2
         libbpf1
+        libcap-ng-utils
         libcap-ng0
         libcrypt1
         libcryptsetup12
@@ -38,6 +39,7 @@ Packages=
         libxkbcommon0
         pam
         python3-pefile
+        shadow
         tpm2-0-tss
         vim
 
diff --git a/mkosi.conf.d/ubuntu/10-ubuntu.conf b/mkosi.conf.d/ubuntu/10-ubuntu.conf
index 647a71826c2..a34fe8d94f8 100644
--- a/mkosi.conf.d/ubuntu/10-ubuntu.conf
+++ b/mkosi.conf.d/ubuntu/10-ubuntu.conf
@@ -21,6 +21,7 @@ Packages=
         libasound2
         libbpf0
         libc6-i386
+        libcap-ng-utils
         libcap-ng0
         libfdisk1
         libfido2-1
@@ -37,6 +38,7 @@ Packages=
         linux-tools-common
         linux-tools-generic
         netcat-openbsd
+        passwd
         policykit-1
         procps
         python3-pefile