From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 23 Jul 2023 08:01:25 +0000 (+0200)
Subject: Always install bash in the initrd
X-Git-Tag: v15~64^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1700%2Fhead;p=thirdparty%2Fmkosi.git

Always install bash in the initrd

Let's make sure we always have a shell in the initrd so that sulogin
works correctly.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 506876ecd..415ec2a18 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -853,9 +853,10 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
                 "--format", "cpio",
                 "--package", "systemd",
                 "--package", "util-linux",
-                *(["--package", "udev"] if not state.config.distribution.is_portage_distribution() else []),
                 "--package", "kmod",
+                "--package", "bash",
                 *(["--package", "dmsetup"] if state.config.distribution.is_apt_distribution() else []),
+                *(["--package", "udev"] if not state.config.distribution.is_portage_distribution() else []),
                 "--output", f"{state.config.output}-initrd",
                 *(["--image-version", state.config.image_version] if state.config.image_version else []),
                 "--make-initrd", "yes",