From 262cd9facdcff27bc6c7a5eca7e361bdfe38b6c4 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 19 Dec 2020 19:47:50 +0100
Subject: [PATCH] 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.
---
 .mkosi/mkosi.arch     | 2 ++
 .mkosi/mkosi.debian   | 2 ++
 .mkosi/mkosi.fedora   | 2 ++
 .mkosi/mkosi.opensuse | 2 ++
 .mkosi/mkosi.ubuntu   | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 81ce68ccd98..8b9b7c72e75 100644
--- 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 69640fa81b7..7da81298a21 100644
--- 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 680e6fb6a48..f383e11c657 100644
--- 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 0dcd0c436d1..5d75eecddcd 100644
--- 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 1c22ee04abd..09afafb9dbd 100644
--- 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
-- 
2.47.3