From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 8 Sep 2024 14:38:41 +0000 (+0200)
Subject: Install various shells in the default image
X-Git-Tag: v25~309^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deaa6cc40969833650e2ad02b8dab7fc96815432;p=thirdparty%2Fmkosi.git

Install various shells in the default image
---

diff --git a/mkosi.conf b/mkosi.conf
index cb9fe1308..3ecb97759 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -15,6 +15,7 @@ BuildSources=.
 BuildSourcesEphemeral=yes
 
 Packages=
+        bash
         binutils
         gdb
         less
@@ -24,6 +25,7 @@ Packages=
         systemd
         tmux
         udev
+        zsh
 
 InitrdPackages=
         less
diff --git a/mkosi.conf.d/20-arch.conf b/mkosi.conf.d/20-arch.conf
index 60f92e49b..beb2820f6 100644
--- a/mkosi.conf.d/20-arch.conf
+++ b/mkosi.conf.d/20-arch.conf
@@ -9,6 +9,7 @@ Packages=
         bash
         dbus-broker
         dbus-broker-units
+        fish
         grub
         iproute
         iputils
diff --git a/mkosi.conf.d/20-centos/mkosi.conf b/mkosi.conf.d/20-centos/mkosi.conf
index 117ef9ba6..ca3d826bc 100644
--- a/mkosi.conf.d/20-centos/mkosi.conf
+++ b/mkosi.conf.d/20-centos/mkosi.conf
@@ -12,6 +12,7 @@ Release=9
 # CentOS Stream 10 does not ship an unsigned shim
 ShimBootloader=none
 Packages=
+        fish
         kernel-core
         linux-firmware
         perf
diff --git a/mkosi.conf.d/20-fedora/mkosi.conf b/mkosi.conf.d/20-fedora/mkosi.conf
index 75101a1ee..28a8009c9 100644
--- a/mkosi.conf.d/20-fedora/mkosi.conf
+++ b/mkosi.conf.d/20-fedora/mkosi.conf
@@ -8,6 +8,7 @@ Release=rawhide
 
 [Content]
 Packages=
+        fish
         kernel-core
         perf
         qemu-user-static
diff --git a/mkosi.conf.d/20-opensuse/mkosi.conf b/mkosi.conf.d/20-opensuse/mkosi.conf
index d16bf3541..39a0b435d 100644
--- a/mkosi.conf.d/20-opensuse/mkosi.conf
+++ b/mkosi.conf.d/20-opensuse/mkosi.conf
@@ -12,6 +12,7 @@ ShimBootloader=none
 Packages=
         bash
         diffutils
+        fish
         iproute
         iputils
         kernel-kvmsmall
diff --git a/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf b/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf
index 316070ec4..782a0e231 100644
--- a/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/30-debian-kali-ubuntu/mkosi.conf
@@ -13,6 +13,7 @@ Packages=
         ^libtss2-mu[0-9.-]+$
         bash
         dbus-broker
+        fish
         iproute2
         iputils-ping
         libtss2-rc0