mkosi-tools: Drop fish and zsh

These are a bit too exquisite to have in the default tools tree and
we don't start a shell in mkosi-sandbox by default anymore, so let's
stick to just having bash in the default tools tree.

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf
index c0f03cedd85d17f4dbd92e3b54857c30d5d348b0..cd2f8bb0cb18af4f2c0e26abecf2f6c85763cbca 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf
@@ -40,5 +40,4 @@ Packages=
         tar
         util-linux
         xfsprogs
-        zsh
         zstd

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
index 7ea74a9580229547912c49bfbf68ed09662b082b..5e999a4b64253ff36cdcb8aedbdcee7105b0d789 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-arch.conf
@@ -16,7 +16,6 @@ Packages=
         dpkg
         edk2-ovmf
         erofs-utils
-        fish
         git
         grub
         libseccomp

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf
index 3885748381484e81d4bd889f1b720980065bdf64..bc3ba0f3d0f37cc4eae25ef04553f61d5cb53bd2 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-10.conf
@@ -8,4 +8,3 @@ Release=10
 Packages=
         btrfs-progs
         distribution-gpg-keys
-        fish

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf
index 85eba17d18944f47e486439411a35450f1c6bea0..3c5c65f3c495ad26e89fcc20d6a9f874f7307cdd 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos/mkosi.conf.d/20-epel-packages-9.conf
@@ -11,7 +11,6 @@ Packages=
         btrfs-progs
         debian-keyring
         distribution-gpg-keys
-        fish
         pacman
         sbsigntools
         ubu-keyring

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
index 746054cd1e51f5fa6f0753313e6bf689edfcabd8..9c96f39e6f9b9ede0f4baf711c5622f6fbad2e07 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
@@ -18,7 +18,6 @@ Packages=
         debian-archive-keyring
         dnf
         erofs-utils
-        fish
         git-core
         grub-common
         libarchive-tools

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
index 4c14ab6efd4f55ed8a7de497acf3489fce2b9814..4dd94a62a3d24e89245d90990030612032ab829f 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-fedora/mkosi.conf
@@ -13,7 +13,6 @@ Packages=
         dnf5
         dnf5-plugins
         erofs-utils
-        fish
         pacman
         perf
         pkcs11-provider

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
index 8bd7fb253c789a18cbcdc2e6f3298a520163edda..a6d9d511d28fb5004024ab6f2616f82ea4b37653 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-opensuse.conf
@@ -12,7 +12,6 @@ Packages=
         dnf5
         dnf5-plugins
         erofs-utils
-        fish
         git-core
         glibc-gconv-modules-extra
         grep