From ab40cf9a820a8bc338c62da7883ea984081294ab Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 3 Jan 2025 14:24:31 +0300 Subject: [PATCH] Fix typos --- ...ate-live-image-bootloader-to-Russian.patch | 69 +++++++++++++------ 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch b/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch index 072f628..a14c234 100644 --- a/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch +++ b/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch @@ -1,4 +1,4 @@ -From 936994d7fcb092945885e876ba40ecf38bb7831f Mon Sep 17 00:00:00 2001 +From cb67374dce91624cd4998b17b5faca2aabd2d28c Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 29 Jul 2023 15:34:37 +0200 Subject: [PATCH 3/3] Translate live image bootloader to Russian @@ -8,12 +8,12 @@ Subject: [PATCH 3/3] Translate live image bootloader to Russian .../live/config_files/aarch64/grub2-efi.cfg | 13 ++++-- 80-rhel/live/config_files/x86/grub2-bios.cfg | 21 +++++----- 80-rhel/live/config_files/x86/grub2-efi.cfg | 13 ++++-- - 80-rhel/live/efi.tmpl | 6 +++ - 80-rhel/live/x86.tmpl | 40 ++++++++++++++++++- - 6 files changed, 83 insertions(+), 22 deletions(-) + 80-rhel/live/efi.tmpl | 8 ++++ + 80-rhel/live/x86.tmpl | 42 +++++++++++++++++-- + 6 files changed, 86 insertions(+), 23 deletions(-) diff --git a/80-rhel/live/aarch64.tmpl b/80-rhel/live/aarch64.tmpl -index d1a3f87..f8bb655 100644 +index d1a3f87..b5eadc0 100644 --- a/80-rhel/live/aarch64.tmpl +++ b/80-rhel/live/aarch64.tmpl @@ -21,6 +21,16 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: @@ -38,7 +38,7 @@ index d1a3f87..f8bb655 100644 treeinfo images-${basearch} ${img|basename} ${img} %endfor - <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args"/> -+ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args, FLAVOR=FLAVOR""/> ++ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args, FLAVOR=FLAVOR"/> %endif # Create optional product.img and updates.img @@ -165,10 +165,26 @@ index 3906958..05c846d 100644 initrdefi @INITRDPATH@ } diff --git a/80-rhel/live/efi.tmpl b/80-rhel/live/efi.tmpl -index 813f91e..50f95e6 100644 +index 813f91e..cfc63ec 100644 --- a/80-rhel/live/efi.tmpl +++ b/80-rhel/live/efi.tmpl -@@ -35,7 +35,13 @@ ${make_efiboot("images/efiboot.img")} +@@ -7,6 +7,7 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol" + + mkdir ${EFIBOOTDIR} + mkdir ${EFIBOOTDIR}/fonts/ ++mkdir ${EFIBOOTDIR}/locale/ + %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}/ + install boot/efi/EFI/*/gcd${efiarch32|lower}.efi ${EFIBOOTDIR}/grub${efiarch32|lower}.efi + %endif + install usr/share/grub/unicode.pf2 ${EFIBOOTDIR}/fonts/ ++install /usr/share/locale/ru/LC_MESSAGES/grub.mo ${EFIBOOTDIR}/locale/ru.mo + + ## actually make the EFI images + ${make_efiboot("images/efiboot.img")} +@@ -35,7 +37,13 @@ ${make_efiboot("images/efiboot.img")} copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR} %endif install ${configdir}/grub2-efi.cfg ${eficonf} @@ -183,7 +199,7 @@ index 813f91e..50f95e6 100644 replace @KERNELNAME@ vmlinuz ${eficonf} replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl -index cf4dad4..30462ec 100644 +index cf4dad4..48012df 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl @@ -22,6 +22,16 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: @@ -216,26 +232,26 @@ index cf4dad4..30462ec 100644 -replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg +%if product.name == 'MSVSphere GNOME': +replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.cfg -+replace @FLAVOR@ ' GNOME' ${GRUB2DIR}/grub.conf ++replace @FLAVOR@ ' GNOME' ${GRUB2DIR}/grub.cfg +%endif +%if product.name == 'MSVSphere Cinnamon': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.conf -+replace @FLAVOR@ ' Cinnamon' ${GRUB2DIR}/grub.conf ++replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.cfg ++replace @FLAVOR@ ' Cinnamon' ${GRUB2DIR}/grub.cfg +%endif +%if product.name == 'MSVSphere KDE': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.conf -+replace @FLAVOR@ ' KDE' ${GRUB2DIR}/grub.conf ++replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.cfg ++replace @FLAVOR@ ' KDE' ${GRUB2DIR}/grub.cfg +%endif -+%if product.name == 'MSVSphere XFCE':grub.conf -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.conf -+replace @FLAVOR@ ' XFCE' ${GRUB2DIR}/grub.conf ++%if product.name == 'MSVSphere XFCE': ++replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.cfg ++replace @FLAVOR@ ' XFCE' ${GRUB2DIR}/grub.cfg +%endif +%if product.name == 'MSVSphere ARM': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.conf -+replace @FLAVOR@ ' АРМ' ${GRUB2DIR}/grub.conf ++replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.cfg ++replace @FLAVOR@ ' АРМ' ${GRUB2DIR}/grub.cfg +%else: -+replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf -+replace @FLAVOR@ '' ${BOOTDIR}/grub.conf ++replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg ++replace @FLAVOR@ '' ${GRUB2DIR}/grub.cfg +%endif replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg @@ -245,10 +261,19 @@ index cf4dad4..30462ec 100644 %endif %if (efiarch32 or efiarch64): - <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args"/> -+ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args, FLAVOR=FLAVOR""/> ++ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, extra_boot_args=extra_boot_args, FLAVOR=FLAVOR"/> %endif # Create optional product.img and updates.img +@@ -80,7 +116,7 @@ replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg + %endfor + + # Add the license files +-%for f in glob("usr/share/licenses/*-release-common/*"): ++%for f in glob("/usr/share/sphere-release/EULA"): + install ${f} ${f|basename} + <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> + %endfor -- 2.47.1