setup-disk: Add keymap to initfs if root is ZFS

alpine-conf: setup-disk: Add keymap to initfs if root is ZFS v1 PROPOSED

Edin Taric <unicorn@regrow.earth>

Edin Taric: 1
 setup-disk: Add keymap to initfs if root is ZFS

 1 files changed, 4 insertions(+), 0 deletions(-)

Export patchset (mbox)

How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.alpinelinux.org/~alpine/devel/patches/3945/mbox | git am -3

Learn more about email & git

Reply to thread View this thread in the archives

[PATCH alpine-conf] setup-disk: Add keymap to initfs if root is ZFS Export this patch

Edin Taric <unicorn@regrow.earth>

2 years ago

Checks whether $rootfs is ZFS and adds "keymap" to $initfs_features.
This is required for encrypted ZFS installations that prompt for a
passphrase at boot to ensure that the appropriate keymap is used for
non-US keyboard users.
ref: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13291

Signed-off-by: Edin Taric <unicorn@regrow.earth>
---
 setup-disk.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup-disk.in b/setup-disk.in
index 58ea7c8..df760ab 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -492,6 +492,10 @@ install_mounted_root() {
 	root_fs=$(find_mount_fs "$mnt")
 	initfs_features="$initfs_features $root_fs"
 
+	if [ "$rootfs" = "zfs" ]; then
+		initfs_features="$initfs_features keymap"
+	fi
+
 	if is_lvm "$rootdev"; then
 		initfs_features="$initfs_features lvm"
 		local vg=$(find_volume_group "$rootdev")
-- 
2.34.1