Merge branch 'main' into patch-4

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*"

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"
-# For a German system, you could use:
+# 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"
 
 
 ################################################

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