manuel
/
gentoo-install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: always use included locale file to prevent mismatches (closes #52)

This commit is contained in:
oddlama 2022-09-28 17:45:10 +02:00
parent c56f1766cc
commit 3e18167a06
No known key found for this signature in database
GPG Key ID: 14EFE510775FE39A
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -191,7 +191,7 @@ you can use the installer to chroot into an existing system. Run `./install --he
If you encounter this problem, you might be able to fix the problem by switching to testing by dropping to a shell temporarily: If you encounter this problem, you might be able to fix the problem by switching to testing by dropping to a shell temporarily:
``` ```
# Press S<Enter> when ased about what to do next. # Press S<Enter> when asked about what to do next.
# This opens an emergency shell in the chroot. # This opens an emergency shell in the chroot.
echo 'ACCEPT_KEYWORDS="~amd64"' >> /etc/portage/make.conf # Enable testing for your architecture. echo 'ACCEPT_KEYWORDS="~amd64"' >> /etc/portage/make.conf # Enable testing for your architecture.
emerge -v gentoo-kernel-bin # Update kernel to newest version emerge -v gentoo-kernel-bin # Update kernel to newest version

10
configure vendored
View File

@ -108,14 +108,6 @@ function get_all_timezones() {
readarray -t ALL_TIMEZONES < <(find /usr/share/zoneinfo -type f -printf "%P\n" | sort -u) readarray -t ALL_TIMEZONES < <(find /usr/share/zoneinfo -type f -printf "%P\n" | sort -u)
} }
function get_supported_locales() {
if [[ -e /usr/share/i18n/SUPPORTED ]]; then
echo /usr/share/i18n/SUPPORTED
else
echo "$GENTOO_INSTALL_REPO_DIR/contrib/i18n_supported"
fi
}
function recalculate_locales() { function recalculate_locales() {
LOCALES="" LOCALES=""
N_LOCALES=0 N_LOCALES=0
@ -329,7 +321,7 @@ function create_btrfs_centric_layout() {
get_all_keymaps get_all_keymaps
get_all_timezones get_all_timezones
readarray -t SUPPORTED_LOCALES < "$(get_supported_locales)" readarray -t SUPPORTED_LOCALES < "$GENTOO_INSTALL_REPO_DIR/contrib/i18n_supported"
readarray -t LOCALE_A < <(locale -a) readarray -t LOCALE_A < <(locale -a)

2
contrib/i18n_supported
View File

@ -1,4 +1,3 @@
C.UTF-8 UTF-8
aa_DJ.UTF-8 UTF-8 aa_DJ.UTF-8 UTF-8
aa_DJ ISO-8859-1 aa_DJ ISO-8859-1
aa_ER UTF-8 aa_ER UTF-8
@ -77,6 +76,7 @@ brx_IN UTF-8
bs_BA.UTF-8 UTF-8 bs_BA.UTF-8 UTF-8
bs_BA ISO-8859-2 bs_BA ISO-8859-2
byn_ER UTF-8 byn_ER UTF-8
C.UTF-8 UTF-8
ca_AD.UTF-8 UTF-8 ca_AD.UTF-8 UTF-8
ca_AD ISO-8859-15 ca_AD ISO-8859-15
ca_ES.UTF-8 UTF-8 ca_ES.UTF-8 UTF-8