Received: from mail.regrow.earth (mail.regrow.earth [62.113.204.201]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 6B3EC781180 for <~alpine/devel@lists.alpinelinux.org>; Thu, 17 Feb 2022 11:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=regrow.earth; s=2021-03-15_regrow.earth; t=1645096719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=4T+GUD8BCTo/fjCyC9Eo+/gpIW01xzmeHoxJ9/6BAT8=; b=PZwptnU0WDEXz4s4M/GFC3g8LNLf6JQPA05xxMSKMCRr5sM8q3GatRIjLL+Lbd2bPFZP1V bNePcKUb4q4zjcFpvDKuEKtV63GZOsZV5iwLUJB2C6XM2UNfHbiMgGfsD0YLq8D/rPIz0Q kJEir7Jp99nD3ZKiYgRGa2+edWpIh7A+N5l61MFya03BqOhy2PyLfU0zyWl9B+bZzO9ShU kS+Tf4gxpGAEXu3EQtvPeyGO82s4dxwlxongOEg0x7+XTGdiNum5BETjNuWLvOmU0QyjFw 0lKhMRzay0uZQ+SX6IQ4FlCuFqlwIg0nI46r7YZlbvant4FPhCtxu+ZxTlgS2Q== Received: by mail.regrow.earth (OpenSMTPD) with ESMTPSA id 0528fd36 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 17 Feb 2022 12:18:39 +0100 (CET) From: Edin Taric To: ~alpine/devel@lists.alpinelinux.org Cc: Edin Taric Subject: [PATCH alpine-conf] setup-disk: Add keymap to initfs if root is ZFS Date: Thu, 17 Feb 2022 12:17:18 +0100 Message-Id: <20220217111717.8899-1-unicorn@regrow.earth> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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