mkosi: Add basic editors to final images

It's often useful to have an editor available to edit some random
config file in the final image. Let's install some basic editors
that don't take up too much space.

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 81ce68ccd980801f86b7d3ab686978ebca7c22d0..8b9b7c72e75cacad21fdfb68161eb1c632e2e995 100644 (file)
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -56,8 +56,10 @@ BuildPackages=
 Packages=
         gdb
         libidn2
+        nano
         qrencode
         strace
+        vi
 
 [Host]
 QemuHeadless=yes

diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 69640fa81b766e7bc64bf8536e12e3e78d2c0d71..7da81298a2143c431e43ff3c79efbb83109550fc 100644 (file)
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -73,7 +73,9 @@ Packages=
         # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
         libtss2-dev
         locales
+        nano
         strace
+        vim-tiny
 
 [Host]
 QemuHeadless=yes

diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index 680e6fb6a48cfa6c23594d1b443cfee578a3cfdd..f383e11c6574476505e723a02bdb8bb79abe9683 100644 (file)
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -77,10 +77,12 @@ Packages=
         # libfido2 + libzstd can be dropped once the Fedora RPM gets a dependency on them
         libfido2
         libzstd
+        nano
         # procps-ng provides a set of useful utilies (ps, free, etc)
         procps-ng
         strace
         tpm2-tss
+        vi
 
 BuildDirectory=mkosi.builddir
 Cache=mkosi.cache

diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse
index 0dcd0c436d1c39394f5a8ec3729b8bc64c3d1dfb..5d75eecddcd7834cded601982fb4748afc6d7a03 100644 (file)
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@@ -76,8 +76,10 @@ Packages=
         libqrencode4
         libseccomp2
         pam
+        nano
         strace
         util-linux
+        vi
 
 [Host]
 QemuHeadless=yes

diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 1c22ee04abd3cf0f4f9a3567f8747d6f128598fb..09afafb9dbdfcff5e57d3c546820d0d249140886 100644 (file)
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -76,7 +76,9 @@ Packages=
         # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
         libtss2-dev
         locales
+        nano
         strace
+        vim-tiny
 
 [Host]
 QemuHeadless=yes