diff --git a/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch b/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch index 3e91a88..da3d471 100644 --- a/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch +++ b/SOURCES/0003-Translate-installation-image-bootloader-to-Russian.patch @@ -1,14 +1,14 @@ -From 953c0d9d3a23ca9218ec712660e802693a3913e7 Mon Sep 17 00:00:00 2001 +From 052906521348a219d2efc021aadcabf13446978a Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 22 Dec 2023 16:29:51 +0300 -Subject: [PATCH 3/4] Translate installation image bootloader to Russian +Subject: [PATCH 3/3] Translate installation image bootloader to Russian --- 80-rhel/config_files/x86/grub2-efi.cfg | 15 ++++++---- 80-rhel/config_files/x86/isolinux.cfg | 40 +++++++++++++++----------- - 80-rhel/efi.tmpl | 7 +++++ + 80-rhel/efi.tmpl | 10 ++++++- 80-rhel/x86.tmpl | 24 ++++++++++++++-- - 4 files changed, 62 insertions(+), 24 deletions(-) + 4 files changed, 64 insertions(+), 25 deletions(-) diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg index 8c9adad..5a7b61f 100644 @@ -165,10 +165,17 @@ index 1b3fae2..698695a 100644 menu end diff --git a/80-rhel/efi.tmpl b/80-rhel/efi.tmpl -index d73d2d7..22bd0ba 100644 +index d73d2d7..1307d80 100644 --- a/80-rhel/efi.tmpl +++ b/80-rhel/efi.tmpl -@@ -7,6 +7,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" +@@ -1,4 +1,5 @@ +-<%page args="configdir, KERNELDIR, efiarch32, efiarch64, isolabel"/> ++# -*- coding: utf-8 -*- ++<%page args="configdir, KERNELDIR, efiarch32, efiarch64, isolabel, FLAVOR=''"/> + <% + EFIBOOTDIR="EFI/BOOT" + APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns" +@@ -7,6 +8,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}/fonts/ @@ -176,7 +183,7 @@ index d73d2d7..22bd0ba 100644 %if efiarch64: install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/ -@@ -18,6 +19,7 @@ install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ +@@ -18,6 +20,7 @@ install boot/efi/EFI/*/mm${efiarch32|lower}.efi ${EFIBOOTDIR}/ install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi %endif install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ @@ -184,7 +191,7 @@ index d73d2d7..22bd0ba 100644 ## actually make the EFI images ${make_efiboot("images/efiboot.img")} -@@ -39,7 +41,12 @@ ${make_efiboot("images/efiboot.img")} +@@ -39,7 +42,12 @@ ${make_efiboot("images/efiboot.img")} copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR} %endif install ${configdir}/grub2-efi.cfg ${eficonf} diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec index a225440..62c0a8a 100644 --- a/SPECS/lorax-templates-rhel.spec +++ b/SPECS/lorax-templates-rhel.spec @@ -1,6 +1,6 @@ Name: lorax-templates-msvsphere Version: 8.7 -Release: 1%{?dist}.3 +Release: 1%{?dist}.4 Summary: MSVSphere build templates for lorax and livemedia-creator License: GPLv2+ @@ -44,6 +44,10 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/ %{templatedir}/* %changelog +* Tue Jan 23 2024 Arkady L. Shane - 8.7-1.4 +- Define UTF-8 config form efi.tmpl +- Fix missing FLAVOR parameter + * Tue Dec 26 2023 Arkady L. Shane - 8.7-1.3 - Force utf-8 in templates