From c6b2d52ff7f5d33fa29999f0abf02d212fc663a0 Mon Sep 17 00:00:00 2001
From: thiblizz <101073848+thiblizz@users.noreply.github.com>
Date: Sat, 14 Oct 2023 23:47:48 +0200
Subject: [PATCH 1/2] fix: adjust wrong root_fs check

---
 scripts/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/config.sh b/scripts/config.sh
index 0bc92ef..c1a4e22 100644
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -488,7 +488,7 @@ function create_raid0_luks_layout() {
 	if [[ $root_fs == "btrfs" ]]; then
 		DISK_ID_ROOT_TYPE="btrfs"
 		DISK_ID_ROOT_MOUNT_OPTS="defaults,noatime,compress=zstd,subvol=/root"
-	elif [[ $root_fs == "btrfs" ]]; then
+	elif [[ $root_fs == "ext4" ]]; then
 		DISK_ID_ROOT_TYPE="ext4"
 		DISK_ID_ROOT_MOUNT_OPTS="defaults,noatime,errors=remount-ro,discard"
 	else

From 0ebe7915a679270040878977962f01838edb153b Mon Sep 17 00:00:00 2001
From: thiblizz <101073848+thiblizz@users.noreply.github.com>
Date: Sun, 15 Oct 2023 02:18:09 +0200
Subject: [PATCH 2/2] fix: use UTF-8 as the default locale instead of utf8
 (closes #92)

---
 configure           | 2 +-
 gentoo.conf.example | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 5f93bf7..ca77b54 100755
--- a/configure
+++ b/configure
@@ -392,7 +392,7 @@ function load_default_config() {
 	KEYMAP="$(get_default_keymap)"
 	KEYMAP_INITRAMFS="$KEYMAP"
 	LOCALES="C.UTF-8 UTF-8"
-	LOCALE="C.utf8"
+	LOCALE="C.UTF-8"
 
 	SYSTEMD_NETWORKD=true
 	SYSTEMD_NETWORKD_INTERFACE_NAME="en*"
diff --git a/gentoo.conf.example b/gentoo.conf.example
index 0e798c7..b16651e 100644
--- a/gentoo.conf.example
+++ b/gentoo.conf.example
@@ -183,20 +183,21 @@ KEYMAP_INITRAMFS="$KEYMAP"
 
 # A list of additional locales to generate. You should only
 # add locales here if you really need them and want to localize
-# your system. Otherwise, leave this list empty, and use "C.utf8" as the locale.
+# your system. Otherwise, leave this list empty, and use "C.UTF-8" as the locale.
 # Be careful that the syntax for locales is a bit different from the name of the resulting
 # locale. For a list of supported locales, see the file /usr/share/i18n/SUPPORTED.
 LOCALES=""
 # The locale to set for the system. Be careful, the locale names deviate from the LOCALES
 # list entries (e.g. .UTF-8 vs .utf8). See `locale -a` for all available locales.
-LOCALE="C.utf8"
+# Although `locale -a` lists the suffix in lower case without any hyphens, it is best to always use UTF-8 in preference to utf8.
+LOCALE="C.UTF-8"
 # For a german system you could use:
 # LOCALES="
 # de_DE.UTF-8 UTF-8
 # de_DE ISO-8859-1
 # de_DE@euro ISO-8859-15
 # " # End of LOCALES
-# LOCALE="de_DE.utf8"
+# LOCALE="de_DE.UTF-8"
 
 
 ################################################