From 150f995429fd2165386f06020aa01a963b72c412 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Fri, 19 Jan 2024 16:44:45 +0300
Subject: [PATCH] Force Russian language during installation

---
 ...Russian-language-during-installation.patch | 73 +++++++++++++++++++
 SPECS/lorax-templates-rhel.spec               |  6 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0008-Force-Russian-language-during-installation.patch

diff --git a/SOURCES/0008-Force-Russian-language-during-installation.patch b/SOURCES/0008-Force-Russian-language-during-installation.patch
new file mode 100644
index 0000000..9f6e227
--- /dev/null
+++ b/SOURCES/0008-Force-Russian-language-during-installation.patch
@@ -0,0 +1,73 @@
+From 8099c5c0690f0cce7cff01a355c58d20c5f60f14 Mon Sep 17 00:00:00 2001
+From: tigro <tigro@msvsphere-os.ru>
+Date: Fri, 19 Jan 2024 16:42:18 +0300
+Subject: [PATCH 8/8] Force Russian language during installation
+
+---
+ 80-rhel/efi.tmpl      | 4 ++--
+ 80-rhel/live/efi.tmpl | 4 ++--
+ 80-rhel/live/x86.tmpl | 2 +-
+ 80-rhel/x86.tmpl      | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/80-rhel/efi.tmpl b/80-rhel/efi.tmpl
+index 436d547..4975ec4 100644
+--- a/80-rhel/efi.tmpl
++++ b/80-rhel/efi.tmpl
+@@ -53,9 +53,9 @@ ${make_efiboot("images/efiboot.img")}
+     replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}
+     replace @ISOLABEL@ '${isolabel}' ${eficonf}
+     %if disk:
+-        replace @ROOT@ 'inst.stage2=hd:LABEL=ANACONDA inst.geoloc=0' ${eficonf}
++        replace @ROOT@ 'inst.stage2=hd:LABEL=ANACONDA inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${eficonf}
+     %else:
+-        replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${eficonf}
++        replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${eficonf}
+     %endif
+     %if efiarch32 == 'IA32':
+         copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
+diff --git a/80-rhel/live/efi.tmpl b/80-rhel/live/efi.tmpl
+index a225a88..01ef21c 100644
+--- a/80-rhel/live/efi.tmpl
++++ b/80-rhel/live/efi.tmpl
+@@ -53,9 +53,9 @@ ${make_efiboot("images/efiboot.img")}
+     replace @ISOLABEL@ '${isolabel}' ${eficonf}
+     replace @EXTRA@ '${extra_boot_args}' ${eficonf}
+     %if disk:
+-        replace @ROOT@ 'root=live:LABEL=ANACONDA inst.geoloc=0' ${eficonf}
++        replace @ROOT@ 'root=live:LABEL=ANACONDA inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${eficonf}
+     %else:
+-        replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${eficonf}
++        replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${eficonf}
+     %endif
+     %if efiarch32 == 'IA32':
+         copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
+diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
+index 0b92fd6..a574596 100644
+--- a/80-rhel/live/x86.tmpl
++++ b/80-rhel/live/x86.tmpl
+@@ -71,7 +71,7 @@ replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+ replace @FLAVOR@ '' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+ %endif
+ replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf
+-replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${BOOTDIR}/isolinux.cfg
++replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${BOOTDIR}/isolinux.cfg
+ replace @EXTRA@ '${extra_boot_args}' ${BOOTDIR}/isolinux.cfg
+ 
+ ## convert BIOS bootloader configs to cp866 encoding
+diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
+index e5d02cb..8fffc5e 100644
+--- a/80-rhel/x86.tmpl
++++ b/80-rhel/x86.tmpl
+@@ -61,7 +61,7 @@ replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+ %endif
+ replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf
+ replace @FLAVOR@ '${FLAVOR}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+-replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${BOOTDIR}/isolinux.cfg
++replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${BOOTDIR}/isolinux.cfg
+ 
+ ## convert BIOS bootloader configs to cp866 encoding
+ iconv 'cp866' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+-- 
+2.43.0
+
diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec
index 30f82b0..d20a9bf 100644
--- a/SPECS/lorax-templates-rhel.spec
+++ b/SPECS/lorax-templates-rhel.spec
@@ -1,6 +1,6 @@
 Name:           lorax-templates-msvsphere
 Version:        9.0
-Release:        37%{?dist}.10
+Release:        37%{?dist}.11
 Summary:        MSVSphere 9 build templates for lorax and livemedia-creator
 
 License:        GPLv2+
@@ -17,6 +17,7 @@ Patch1004:      0004-Translate-live-image-bootloader-to-Russian.patch
 Patch1005:      0005-Disable-geo-location.patch
 Patch1006:      0006-Update-title-color.patch
 Patch1007:      0007-Add-sphere-licenses-to-live-media.patch
+Patch1008:      0008-Force-Russian-language-during-installation.patch
 
 # Required for the template branding support
 # Required for Russian localization
@@ -54,6 +55,9 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/
 %{templatedir}/*
 
 %changelog
+* Fri Jan 19 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.11
+- Force Russian language during installation
+
 * Mon Oct 30 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.10
 - Copy only EULA on live