root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

change EN_US-UTF.8 to C-UTF.8 by default

Browse source
This commit is contained in:
Tobias Powalowski 2022-03-21 14:56:23 +01:00
parent 7dab62bcf6
commit 3164dd8174
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/bin/archboot-quickinst.sh
View file

@ -175,8 +175,8 @@ chroot_mount
install_packages || (echo "Package installation FAILED."; chroot_umount; exit 1)
# /etc/locale.gen
# enable at least en_US.UTF8 if nothing was changed, else weird things happen on reboot!
! grep -q "^[a-z]" "${DESTDIR}/etc/locale.gen" && sed -i -e 's:^#en_US.UTF-8:en_US.UTF-8:g' "${DESTDIR}/etc/locale.gen"
# enable at least C.UTF-8 if nothing was changed, else weird things happen on reboot!
! grep -q "^[a-z]" "${DESTDIR}/etc/locale.gen" && sed -i -e 's:^#C.UTF-8:C.UTF-8:g' "${DESTDIR}/etc/locale.gen"
chroot "${DESTDIR}" locale-gen >/dev/null 2>&1
# umount chroot

6
usr/bin/archboot-setup.sh
View file

@ -4549,7 +4549,7 @@ auto_system_files () {
echo "myhostname" > "${DESTDIR}"/etc/hostname
fi
if [[ ! -f ${DESTDIR}/etc/locale.conf ]]; then
echo "LANG=en_US.UTF-8" > "${DESTDIR}"/etc/locale.conf
echo "LANG=C.UTF-8" > "${DESTDIR}"/etc/locale.conf
echo "LC_COLLATE=C" >> "${DESTDIR}"/etc/locale.conf
fi
}
@ -4644,8 +4644,8 @@ configure_system() {
# /etc/initcpio.conf
run_mkinitcpio
# /etc/locale.gen
# enable at least en_US.UTF8 if nothing was changed, else weird things happen on reboot!
! grep -q "^[a-z]" "${DESTDIR}"/etc/locale.gen && sed -i -e 's:^#en_US.UTF-8:en_US.UTF-8:g' "${DESTDIR}"/etc/locale.gen
# enable at least C.UTF8 if nothing was changed, else weird things happen on reboot!
! grep -q "^[a-z]" "${DESTDIR}"/etc/locale.gen && sed -i -e 's:^#C.UTF-8:C.UTF-8:g' "${DESTDIR}"/etc/locale.gen
chroot "${DESTDIR}" locale-gen >/dev/null 2>&1
## END POSTPROCESSING ##
NEXTITEM="7"