[gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: targets/support/

["Andreas K. Hüttel" <dilfridge@gentoo.org>]

commit:     b83c0a6bb8726be79cec3eca1d2cbfa40bf481cd
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 13:02:12 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 13:02:12 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b83c0a6b

Do more things the oldfashoned way. Quaint but works.

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/diskimage-installation.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/targets/support/diskimage-installation.sh b/targets/support/diskimage-installation.sh
index c7ee4f0b..d357a1d7 100755
--- a/targets/support/diskimage-installation.sh
+++ b/targets/support/diskimage-installation.sh
@@ -25,17 +25,23 @@ END
 echo "Running systemctl preset-all"
 systemctl preset-all || die "Running systemctl preset-all failed"
 
+echo "Setting locale"
+echo "en_US.UTF-8" > /etc/locale.conf || die "Failed to set locale"
+
+echo "Setting keymap"
+echo "KEYMAP=us" > /etc/vconsole.conf || die "Failed to set keymap"
+
 echo "Disk image type is ${clst_diskimage_type}"
 case ${clst_diskimage_type} in
 	generic)
 		echo "Setting up generic image (warning, not very useful on its own)"
 		echo "Running systemd-firstboot"
-		systemd-firstboot --locale=en_US.UTF-8 --keymap=us --timezone=UTC || die "Failed running systemd-firstboot"
+		systemd-firstboot --timezone=UTC || die "Failed running systemd-firstboot"
 		;;
 	console)
 		echo "Setting up console log-in image. Please set the root password ASAP."
 		echo "Running systemd-firstboot"
-		systemd-firstboot --locale=en_US.UTF-8 --keymap=us --timezone=UTC --delete-root-password || die "Failed running systemd-firstboot"
+		systemd-firstboot --timezone=UTC --delete-root-password || die "Failed running systemd-firstboot"
 		;;
 	*)
 		die "As yet unsupported image type"