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

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

[Andreas K. Hüttel]

commit:     cbc96d9bc24ab9853e40746fef98e5f680da0bb1
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 17:06:10 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 17:06:10 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cbc96d9b

Default to C.UTF-8 same as the ISO

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

 targets/support/diskimagefs-update.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/targets/support/diskimagefs-update.sh b/targets/support/diskimagefs-update.sh
index d7d005de..28b5551f 100755
--- a/targets/support/diskimagefs-update.sh
+++ b/targets/support/diskimagefs-update.sh
@@ -36,15 +36,16 @@ configure_sshd() {
 
 echo "Generating /etc/locale.gen"
 cat > /etc/locale.gen <<END
-en_US ISO-8859-1
-en_US.UTF-8 UTF-8
+# en_US ISO-8859-1
+# en_US.UTF-8 UTF-8
+C.UTF-8 UTF-8
 END
 
 echo "Running systemctl preset-all"
 systemctl preset-all || die "Running systemctl preset-all failed"
 
 echo "Setting locale"
-echo 'LANG="en_US.UTF-8"' > /etc/locale.conf || die "Failed to set locale"
+echo 'LANG="C.UTF-8"' > /etc/locale.conf || die "Failed to set locale"
 env-update || die "Failed to run env-update"
 
 echo "Setting keymap"

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

[Andreas K. Hüttel]

commit:     6fc2a098b1eeac6f0aa5799da44f89742807660a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 20:00:17 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 20:00:17 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6fc2a098

;;

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

 targets/support/diskimagefs-update.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/targets/support/diskimagefs-update.sh b/targets/support/diskimagefs-update.sh
index 28b5551f..f7da3f0f 100755
--- a/targets/support/diskimagefs-update.sh
+++ b/targets/support/diskimagefs-update.sh
@@ -74,6 +74,7 @@ case ${clst_diskimage_type} in
 		configure_sshd
 		echo "Adding sshd service"
 		systemctl enable sshd
+		;;
 	*)
 		die "As yet unsupported image type"
 		;;