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 ee51396e0487455d8803e22fb9c00d41c890b445..a1bff7709691258b0110d99e1ce2a37793013473 100644 (file)
--- 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 94aeaed9c9cc3b85626f3e3f7bf3d5d75eaab232..91099a7f0a1cfc0eea3164aa82c62f81805706ff 100644 (file)
--- 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 905378a9b4a92d567405c37be4d19ec8343ef92f..0712a70bea752059ac839092ea54e3777f3aa920 100644 (file)
--- 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 5d4959ba1682f4318349ade38b4270d57698ad9d..5c85eebc03c4242a085773c3f1b0952407c4c758 100644 (file)
--- 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 6034b8a87e0b41b88cb4ba46faf090afb42965ee..3b0a643efd2649343ea47a97346d18cdf6f5f65c 100644 (file)
--- 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 647a71826c251c9539fe401ee1feaa5b3decbe38..a34fe8d94f8bb2a923216e61ea93e4473db273b9 100644 (file)
--- 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