From e4ffcdf17797efd83380d4d111fcf57649cb66ec Mon Sep 17 00:00:00 2001 From: Alexander Tratsevskiy Date: Fri, 14 Oct 2022 12:41:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1-merge/sys-apps/openrc/env.d/02locale | 2 +- .../3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub | 2 +- .../3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale index 4ffa5afa0..198450e31 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-apps/openrc/env.d/02locale @@ -1,3 +1,3 @@ # Calculate format=openrc protected -LANG="#-os_install_locale_lang-#".UTF-8 +LANG="#-os_install_locale_locale-#" LC_NUMERIC=POSIX diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub index 09b6d937b..d7bd48b0b 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/update-grub @@ -36,7 +36,7 @@ grep_modules() { before_mods=( $(grep_modules) ) #?ac_install_disk==on# -LANG=#-install.os_install_locale_lang-#.UTF-8 /bin/chroot #-cl_chroot_path-# grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null +LANG=#-install.os_install_locale_locale /bin/chroot #-cl_chroot_path-# grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null #!ac_install_disk# /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null #ac_install_disk# diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen index 995a6c58e..2af0ad088 100644 --- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-libs/glibc/locale.gen @@ -1,6 +1,6 @@ # Calculate comment=# -#?os_install_locale_lang!=en_US# +#?os_install_locale_locale!=en_US.utf8# en_US.UTF-8 UTF-8 -#os_install_locale_lang# -#-os_install_locale_lang-#.UTF-8 UTF-8 +#os_install_locale_locale# +#-os_install_locale_locale-# UTF-8