From 8edaa17c3acc6e185496c641a7769d8b8df6dad0 Mon Sep 17 00:00:00 2001 From: tigro Date: Thu, 2 Jan 2025 21:29:44 +0300 Subject: [PATCH] - Isolinux is obsolete, rebase to grub2-bios.cfg - Update patches - Drop cp866 font - Debranding some items --- .../0001-Remove-RHEL-specific-packages.patch | 4 +- ...allation-image-bootloader-to-Russian.patch | 97 +++++---- ...ate-live-image-bootloader-to-Russian.patch | 189 +++++++++++------- SOURCES/0004-Disable-geo-location.patch | 22 +- SOURCES/0005-Update-title-color.patch | 4 +- ...06-Add-sphere-licenses-to-live-media.patch | 12 +- ...Russian-language-during-installation.patch | 20 +- ...un16-as-default-font-instead-of-eur.patch} | 6 +- SOURCES/cp866-8x16.psf | Bin 4100 -> 0 bytes SPECS/lorax-templates-rhel.spec | 15 +- 10 files changed, 217 insertions(+), 152 deletions(-) rename SOURCES/{0008-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch => 0008-Set-latarcyrheb-sun16-as-default-font-instead-of-eur.patch} (83%) delete mode 100644 SOURCES/cp866-8x16.psf diff --git a/SOURCES/0001-Remove-RHEL-specific-packages.patch b/SOURCES/0001-Remove-RHEL-specific-packages.patch index 345e796..f60666a 100644 --- a/SOURCES/0001-Remove-RHEL-specific-packages.patch +++ b/SOURCES/0001-Remove-RHEL-specific-packages.patch @@ -1,4 +1,4 @@ -From b2cdcabb10b086ccaa265e5ff68a53caaf43dcd1 Mon Sep 17 00:00:00 2001 +From 1d090b196ee96949d74790e022911dd60e3e2212 Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Fri, 20 Dec 2024 11:24:03 +0300 Subject: [PATCH 1/8] Remove RHEL specific packages @@ -20,5 +20,5 @@ index 8f2f3b8..864cc57 100644 ## FIXME Pull in device-mapper-multipath ## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not -- -2.43.5 +2.47.1 diff --git a/SOURCES/0002-Translate-installation-image-bootloader-to-Russian.patch b/SOURCES/0002-Translate-installation-image-bootloader-to-Russian.patch index f94c557..30b4a52 100644 --- a/SOURCES/0002-Translate-installation-image-bootloader-to-Russian.patch +++ b/SOURCES/0002-Translate-installation-image-bootloader-to-Russian.patch @@ -1,4 +1,4 @@ -From 1bf4b4e54f1614dd651d7853847c65fcc5a64cd2 Mon Sep 17 00:00:00 2001 +From 043884dd1c10537ccdca06943d9cea4b350450b9 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Wed, 26 Jul 2023 23:51:00 +0300 Subject: [PATCH 2/8] Translate installation image bootloader to Russian @@ -6,11 +6,12 @@ Subject: [PATCH 2/8] Translate installation image bootloader to Russian --- 80-rhel/aarch64.tmpl | 12 +++++++++- 80-rhel/config_files/aarch64/grub2-efi.cfg | 15 ++++++++---- + 80-rhel/config_files/x86/grub2-bios.cfg | 17 ++++++++----- 80-rhel/config_files/x86/grub2-efi.cfg | 13 ++++++---- 80-rhel/config_files/x86/isolinux.cfg | 28 ++++++++++++---------- 80-rhel/efi.tmpl | 9 ++++++- - 80-rhel/x86.tmpl | 25 +++++++++++++++++-- - 6 files changed, 77 insertions(+), 25 deletions(-) + 80-rhel/x86.tmpl | 12 +++++++++- + 7 files changed, 76 insertions(+), 30 deletions(-) diff --git a/80-rhel/aarch64.tmpl b/80-rhel/aarch64.tmpl index 14099d6..353436a 100644 @@ -85,6 +86,57 @@ index 1ce5d33..5dd2002 100644 linux @KERNELPATH@ @ROOT@ inst.rescue initrd @INITRDPATH@ } +diff --git a/80-rhel/config_files/x86/grub2-bios.cfg b/80-rhel/config_files/x86/grub2-bios.cfg +index cfca1bf..8b8c0ef 100644 +--- a/80-rhel/config_files/x86/grub2-bios.cfg ++++ b/80-rhel/config_files/x86/grub2-bios.cfg +@@ -5,7 +5,12 @@ function load_video { + } + + load_video ++insmod gfxterm ++set gfxmode=auto + set gfxpayload=keep ++set lang=ru_RU ++terminal_output gfxterm ++loadfont unicode + insmod gzio + insmod part_gpt + insmod ext2 +@@ -17,27 +22,27 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++menuentry 'Установить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ quiet + initrd @INITRDPATH@ + } +-menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++menuentry 'Проверить носитель и установить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ rd.live.check quiet + initrd @INITRDPATH@ + } +-submenu 'Troubleshooting -->' { ++submenu 'Устранение неполадок -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ nomodeset quiet + initrd @INITRDPATH@ + } +- menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Восстановление установленной системы' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ inst.rescue quiet + initrd @INITRDPATH@ + } +- menuentry 'Boot first drive' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Загрузка с первого диска' --class fedora --class gnu-linux --class gnu --class os { + chainloader (hd0)+1 + } +- menuentry 'Boot second drive' --class fedora --class gnu-linux --class gnu --class os { ++ menuentry 'Загрузка со второго диска' --class fedora --class gnu-linux --class gnu --class os { + chainloader (hd1)+1 + } + } diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg index 8c9adad..0d5bd2d 100644 --- a/80-rhel/config_files/x86/grub2-efi.cfg @@ -247,10 +299,10 @@ index 80600d2..d36aefa 100644 replace @KERNELNAME@ vmlinuz ${eficonf} replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl -index 3945ce4..dcc1d20 100644 +index 3945ce4..9dbd419 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl -@@ -22,12 +22,25 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: +@@ -22,6 +22,16 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: isoargs = "-iso-level 3" else: isoargs = "" @@ -267,38 +319,7 @@ index 3945ce4..dcc1d20 100644 %> mkdir images - install ${runtime_img} ${STAGE2IMG} - treeinfo stage2 mainimage images/${runtime_base} - -+## add a console font with Russian (cp866) encoding support -+install ${configdir}/cp866-8x16.psf ${BOOTDIR} -+ - ## install kernels - mkdir ${KERNELDIR} - %for kernel in kernels: -@@ -44,12 +57,20 @@ mkdir ${KERNELDIR} - mkdir ${GRUB2DIR} - install ${configdir}/grub2-bios.cfg ${GRUB2DIR}/grub.cfg - replace @VERSION@ ${product.version} ${GRUB2DIR}/grub.cfg --replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg -+%if product.name == 'MSVSphere': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.cfg -+%else: -+replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg -+%endif -+replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg -+replace @FLAVOR@ '${FLAVOR}' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg - replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg - replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg - replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg - replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg - -+## convert BIOS bootloader configs to cp866 encoding -+iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg - - ## WHeeeeeeee, EFI. - <% efiarch32=None; efiarch64=None %> -@@ -60,7 +81,7 @@ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg +@@ -60,7 +70,7 @@ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg <% efiarch64 = 'X64' %> %endif %if (efiarch32 or efiarch64): @@ -308,5 +329,5 @@ index 3945ce4..dcc1d20 100644 # Create optional product.img and updates.img -- -2.43.5 +2.47.1 diff --git a/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch b/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch index 987be02..2d4d5df 100644 --- a/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch +++ b/SOURCES/0003-Translate-live-image-bootloader-to-Russian.patch @@ -1,16 +1,47 @@ -From 633965934ac74eb73fbb1ac7cf9365777197db47 Mon Sep 17 00:00:00 2001 +From 7dd752779308586b809b7afaa13e692c2edab5cb Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 29 Jul 2023 15:34:37 +0200 Subject: [PATCH 3/8] Translate live image bootloader to Russian --- - .../live/config_files/aarch64/grub2-efi.cfg | 13 +++++--- - 80-rhel/live/config_files/x86/grub2-efi.cfg | 11 +++++-- - 80-rhel/live/efi.tmpl | 6 ++++ - 80-rhel/live/x86.tmpl | 30 ++++++++++++++++++- - 80-rhel/x86.tmpl | 2 +- - 5 files changed, 53 insertions(+), 9 deletions(-) + 80-rhel/live/aarch64.tmpl | 12 ++++++++++- + .../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 | 12 ++++++++++- + 6 files changed, 56 insertions(+), 21 deletions(-) +diff --git a/80-rhel/live/aarch64.tmpl b/80-rhel/live/aarch64.tmpl +index d1a3f87..f8bb655 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: + isoargs = "-iso-level 3" + else: + isoargs = "" ++ ++# define an MSVSphere-specific image flavor constant ++if product.variant in ("Minimal", "Server"): ++ FLAVOR=" Сервер" ++elif product.variant == "Certified": ++ FLAVOR=" Сертифицированная" ++elif product.variant == "BaseOS": ++ FLAVOR=" ОС" ++else: ++ FLAVOR="" + %> + + mkdir ${LIVEDIR} +@@ -53,7 +63,7 @@ mkdir ${KERNELDIR} + %> + 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""/> + %endif + + # Create optional product.img and updates.img diff --git a/80-rhel/live/config_files/aarch64/grub2-efi.cfg b/80-rhel/live/config_files/aarch64/grub2-efi.cfg index c874547..c5db696 100644 --- a/80-rhel/live/config_files/aarch64/grub2-efi.cfg @@ -49,8 +80,54 @@ index c874547..c5db696 100644 linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb initrd @INITRDPATH@ } +diff --git a/80-rhel/live/config_files/x86/grub2-bios.cfg b/80-rhel/live/config_files/x86/grub2-bios.cfg +index 73d0a56..0f805c8 100644 +--- a/80-rhel/live/config_files/x86/grub2-bios.cfg ++++ b/80-rhel/live/config_files/x86/grub2-bios.cfg +@@ -5,7 +5,12 @@ function load_video { + } + + load_video ++insmod gfxterm ++set gfxmode=auto + set gfxpayload=keep ++set lang=ru_RU ++terminal_output gfxterm ++loadfont unicode + insmod gzio + insmod part_gpt + insmod ext2 +@@ -17,23 +22,17 @@ set timeout=60 + search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### +-menuentry 'Start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++menuentry 'Запустить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb + initrd @INITRDPATH@ + } +-menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++menuentry 'Проверить носитель и запустить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { + linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet + initrd @INITRDPATH@ + } +-submenu 'Troubleshooting -->' { +- menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset vga=791 quiet rhgb ++submenu 'Устранение неполадок -->' { ++ menuentry 'Запустить @PRODUCT@ @VERSION@@FLAVOR@ (базовый графический режим)' --class fedora --class gnu-linux --class gnu --class os { ++ linux @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb + initrd @INITRDPATH@ + } +- menuentry 'Boot first drive' --class fedora --class gnu-linux --class gnu --class os { +- chainloader (hd0)+1 +- } +- menuentry 'Boot second drive' --class fedora --class gnu-linux --class gnu --class os { +- chainloader (hd1)+1 +- } + } diff --git a/80-rhel/live/config_files/x86/grub2-efi.cfg b/80-rhel/live/config_files/x86/grub2-efi.cfg -index 3906958..3ca2687 100644 +index 3906958..05c846d 100644 --- a/80-rhel/live/config_files/x86/grub2-efi.cfg +++ b/80-rhel/live/config_files/x86/grub2-efi.cfg @@ -9,7 +9,12 @@ function load_video { @@ -66,7 +143,7 @@ index 3906958..3ca2687 100644 insmod gzio insmod part_gpt insmod ext2 -@@ -20,7 +25,7 @@ set timeout=60 +@@ -20,16 +25,16 @@ set timeout=60 search --no-floppy --set=root -l '@ISOLABEL@' ### BEGIN /etc/grub.d/10_linux ### @@ -75,13 +152,14 @@ index 3906958..3ca2687 100644 linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet rhgb initrdefi @INITRDPATH@ } -@@ -28,8 +33,8 @@ menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class g +-menuentry 'Test this media & start @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os { ++menuentry 'Проверить носитель и запустить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os { linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet initrdefi @INITRDPATH@ } -submenu 'Troubleshooting -->' { - menuentry 'Start @PRODUCT@ @VERSION@ in basic graphics mode' --class fedora --class gnu-linux --class gnu --class os { -+submenu 'Проверить носитель и запустить @PRODUCT@ @VERSION@@FLAVOR@ -->' { ++submenu 'Устранение неполадок -->' { + menuentry 'Запустить @PRODUCT@ @VERSION@@FLAVOR@ (базовый графический режим)' --class fedora --class gnu-linux --class gnu --class os { linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image nomodeset quiet rhgb initrdefi @INITRDPATH@ @@ -105,74 +183,35 @@ 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..c88d657 100644 +index cf4dad4..277391b 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl -@@ -28,6 +28,7 @@ mkdir ${LIVEDIR} - install ${runtime_img} ${LIVEDIR}/squashfs.img - treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img - +@@ -22,6 +22,16 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3: + isoargs = "-iso-level 3" + else: + isoargs = "" + - ## install kernels - mkdir ${KERNELDIR} - %for kernel in kernels: -@@ -47,15 +48,42 @@ mkdir ${KERNELDIR} - - ## configure grub2 config file - mkdir ${GRUB2DIR} -+## add a console font with Russian (cp866) encoding support -+install ${configdir}/cp866-8x16.psf ${GRUB2DIR} - install ${configdir}/grub2-bios.cfg ${GRUB2DIR}/grub.cfg - replace @VERSION@ ${product.version} ${GRUB2DIR}/grub.cfg --replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg -+%if product.name == 'MSVSphere GNOME': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+replace @FLAVOR@ ' GNOME' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+%endif -+%if product.name == 'MSVSphere Cinnamon': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+replace @FLAVOR@ ' Cinnamon' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+%endif -+%if product.name == 'MSVSphere KDE': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+replace @FLAVOR@ ' KDE' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+%endif -+%if product.name == 'MSVSphere XFCE': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+replace @FLAVOR@ ' XFCE' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+%endif -+%if product.name == 'MSVSphere ARM': -+replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+replace @FLAVOR@ ' АРМ' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg -+%else: -+replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -+replace @FLAVOR@ '' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg -+%endif -+replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.conf - replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg - replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg - replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg - replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg - replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg ++# define an MSVSphere-specific image flavor constant ++if product.variant in ("Minimal", "Server"): ++ FLAVOR=" Сервер" ++elif product.variant == "Certified": ++ FLAVOR=" Сертифицированная" ++elif product.variant == "BaseOS": ++ FLAVOR=" ОС" ++else: ++ FLAVOR="" + %> -+## convert BIOS bootloader configs to cp866 encoding -+iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg + mkdir ${LIVEDIR} +@@ -66,7 +76,7 @@ replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg + <% efiarch64 = 'X64' %> + %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""/> + %endif - ## WHeeeeeeee, EFI. - <% efiargs=""; efigraft=""; efiarch32=None; efiarch64=None %> -diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl -index dcc1d20..608d8ed 100644 ---- a/80-rhel/x86.tmpl -+++ b/80-rhel/x86.tmpl -@@ -57,7 +57,7 @@ mkdir ${KERNELDIR} - mkdir ${GRUB2DIR} - install ${configdir}/grub2-bios.cfg ${GRUB2DIR}/grub.cfg - replace @VERSION@ ${product.version} ${GRUB2DIR}/grub.cfg --%if product.name == 'MSVSphere': -+%if product.name in ("MSVSphere", "MSVSphere Server"): - replace @PRODUCT@ 'МСВСфера' ${GRUB2DIR}/grub.cfg - %else: - replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg + # Create optional product.img and updates.img -- -2.43.5 +2.47.1 diff --git a/SOURCES/0004-Disable-geo-location.patch b/SOURCES/0004-Disable-geo-location.patch index 8671441..c2c4267 100644 --- a/SOURCES/0004-Disable-geo-location.patch +++ b/SOURCES/0004-Disable-geo-location.patch @@ -1,6 +1,6 @@ -From 734ddc42b648f75a72d4dd490700ee1edce04549 Mon Sep 17 00:00:00 2001 -From: tigro -Date: Sat, 29 Jul 2023 21:12:05 +0200 +From 90462f6a762da5b2c55bdd0cfd92b46dff3ea34c Mon Sep 17 00:00:00 2001 +From: tigro +Date: Thu, 2 Jan 2025 21:15:11 +0300 Subject: [PATCH 4/8] Disable geo location --- @@ -43,10 +43,10 @@ index 50f95e6..08ba750 100644 %if efiarch32 == 'IA32': copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl -index c88d657..3221d72 100644 +index 277391b..82a9ca0 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl -@@ -79,7 +79,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.conf +@@ -63,7 +63,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg @@ -54,20 +54,20 @@ index c88d657..3221d72 100644 +replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg - ## convert BIOS bootloader configs to cp866 encoding + diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl -index 608d8ed..e5d9027 100644 +index 9dbd419..5f42785 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl -@@ -67,7 +67,7 @@ replace @FLAVOR@ '${FLAVOR}' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg +@@ -58,7 +58,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg -replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg +replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg - ## convert BIOS bootloader configs to cp866 encoding - iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg + + ## WHeeeeeeee, EFI. -- -2.43.5 +2.47.1 diff --git a/SOURCES/0005-Update-title-color.patch b/SOURCES/0005-Update-title-color.patch index c067e59..b266661 100644 --- a/SOURCES/0005-Update-title-color.patch +++ b/SOURCES/0005-Update-title-color.patch @@ -1,4 +1,4 @@ -From 219c5085102a61efb0075aa401a57dfb7804c666 Mon Sep 17 00:00:00 2001 +From 5baeed4b94a05afab86ccb2fd864277772360394 Mon Sep 17 00:00:00 2001 From: tigro Date: Thu, 21 Sep 2023 13:47:02 +0300 Subject: [PATCH 5/8] Update title color @@ -21,5 +21,5 @@ index 3cfdbc2..86e24b6 100644 # Press [Tab] message menu color tabmsg 0 #ff3a6496 #00000000 none -- -2.43.5 +2.47.1 diff --git a/SOURCES/0006-Add-sphere-licenses-to-live-media.patch b/SOURCES/0006-Add-sphere-licenses-to-live-media.patch index 6abafbb..b74e850 100644 --- a/SOURCES/0006-Add-sphere-licenses-to-live-media.patch +++ b/SOURCES/0006-Add-sphere-licenses-to-live-media.patch @@ -1,4 +1,4 @@ -From 85d6b9ef141e5d653f246b2e6795e828ee378a88 Mon Sep 17 00:00:00 2001 +From 90b15f518e2d75d1503f94a1cc2a7c9166e681fe Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 30 Sep 2023 16:42:23 +0300 Subject: [PATCH 6/8] Add sphere licenses to live media @@ -9,10 +9,10 @@ Subject: [PATCH 6/8] Add sphere licenses to live media 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/80-rhel/live/aarch64.tmpl b/80-rhel/live/aarch64.tmpl -index d1a3f87..64c7f14 100644 +index f8bb655..2f1f9ee 100644 --- a/80-rhel/live/aarch64.tmpl +++ b/80-rhel/live/aarch64.tmpl -@@ -67,7 +67,7 @@ mkdir ${KERNELDIR} +@@ -77,7 +77,7 @@ mkdir ${KERNELDIR} %endfor # Add the license files @@ -22,10 +22,10 @@ index d1a3f87..64c7f14 100644 <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> %endfor diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl -index 3221d72..6c55318 100644 +index 82a9ca0..9929c7f 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl -@@ -108,7 +108,7 @@ iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg +@@ -90,7 +90,7 @@ replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg %endfor # Add the license files @@ -35,5 +35,5 @@ index 3221d72..6c55318 100644 <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %> %endfor -- -2.43.5 +2.47.1 diff --git a/SOURCES/0007-Force-Russian-language-during-installation.patch b/SOURCES/0007-Force-Russian-language-during-installation.patch index 844283f..694981a 100644 --- a/SOURCES/0007-Force-Russian-language-during-installation.patch +++ b/SOURCES/0007-Force-Russian-language-during-installation.patch @@ -1,6 +1,6 @@ -From a3bcb378f63d4347e2bb0604579342dbdca944b4 Mon Sep 17 00:00:00 2001 +From c602e00c98dd0ed379b2dc02ad1825b90e05b111 Mon Sep 17 00:00:00 2001 From: tigro -Date: Fri, 19 Jan 2024 16:42:18 +0300 +Date: Thu, 2 Jan 2025 21:22:10 +0300 Subject: [PATCH 7/8] Force Russian language during installation --- @@ -43,10 +43,10 @@ index 08ba750..30d5bc9 100644 %if efiarch32 == 'IA32': copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl -index 6c55318..51c51ee 100644 +index 9929c7f..fbf7e97 100644 --- a/80-rhel/live/x86.tmpl +++ b/80-rhel/live/x86.tmpl -@@ -79,7 +79,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.conf +@@ -63,7 +63,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg @@ -54,20 +54,20 @@ index 6c55318..51c51ee 100644 +replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${GRUB2DIR}/grub.cfg replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg - ## convert BIOS bootloader configs to cp866 encoding + diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl -index e5d9027..a57df5e 100644 +index 5f42785..43a21c6 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl -@@ -67,7 +67,7 @@ replace @FLAVOR@ '${FLAVOR}' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg +@@ -58,7 +58,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.cfg replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg -replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg +replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${GRUB2DIR}/grub.cfg - ## convert BIOS bootloader configs to cp866 encoding - iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg + + ## WHeeeeeeee, EFI. -- -2.43.5 +2.47.1 diff --git a/SOURCES/0008-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch b/SOURCES/0008-Set-latarcyrheb-sun16-as-default-font-instead-of-eur.patch similarity index 83% rename from SOURCES/0008-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch rename to SOURCES/0008-Set-latarcyrheb-sun16-as-default-font-instead-of-eur.patch index 6f123ab..482312e 100644 --- a/SOURCES/0008-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch +++ b/SOURCES/0008-Set-latarcyrheb-sun16-as-default-font-instead-of-eur.patch @@ -1,7 +1,7 @@ -From 4a13eb35ae9a695e44c7517934366970c7719879 Mon Sep 17 00:00:00 2001 +From 1c2d354af5bef2edc297282bac2d59e4fdcd420f Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 12 Aug 2024 20:07:46 +0300 -Subject: [PATCH 8/8] Set LatGrkCyr-8x16 as default font instead of eurlatgr +Subject: [PATCH 8/8] Set latarcyrheb-sun16 as default font instead of eurlatgr --- 80-rhel/config_files/common/i18n | 2 +- @@ -24,5 +24,5 @@ index 2bd7892..4eff1d3 100644 -FONT=eurlatgr +FONT=latarcyrheb-sun16 -- -2.43.5 +2.47.1 diff --git a/SOURCES/cp866-8x16.psf b/SOURCES/cp866-8x16.psf deleted file mode 100644 index ed8d5732a223dd2dbbe4283c687d27ae4eb43841..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4100 zcmZu!y=xpt6d&ZUxL7Vqw=Pi_J!HW3md6M^1J-%A05q$BV@x2x3(o#07+F9NSWe=r6NL_?ec;s6H-e)!-p1e`3d1%LMR*;Byxi}_GC zf?ygi;;HgKA6_q4>(%ml_?*dGUax;p9Q1qMma@lC9Te7JL&pK|6#BF2bo%2L1dQip z5@ltXMShtJ1FsY^K@kqor|}dVTWUYO0qO%0F2C}X$~wZNO2US6GaL?8JMZpgRkl~t zx1%V}?eW+~^75!oU(LvG$W4s%joJfOzie}4(9Zv~9RzuKG0Z*hyv(f!7o{JBNqH_} zQI+1YN<)5cskY20lYjdzi+XSfkB6h>ktWse;M1fN4fUS!#(bkL=TY z8_L#XLKzdrAR0gyK=YHA!d|LQ;9l%`o=va66KCTJCig|YLNeA3dXxY!0a^|f@>uB5@54KrUt_Q_o6W9&(%=(`y59N1~_ys^ku@}&MV(l719Y%{qvh@c3I;bYeLmu_K#GkeM+Cq za=%9!m`*YIR__k#)sb*09ieHOsj-U%pvE&%2|5bTT z$-A)i7fZW@q0$W|*h#eG=2a~1M8GteCc8*c>d%Gw^fQujV>QDB36jry(y< z05*O*I4J|W_BS!*C7Qs}qwKqcbENSF{gl{q-{%ny{n;t$*Z86|qh|g+&-Bm^0K^5t z;FkhWeqn}$jfXM+R0!~-_WO#|+j-6QQ4(r@gr2(+VEf2GZRxAiw5|`9M+I2i5jn2ips7+b_5J9hBxg>Gr$OYI*jL98!O}^Ub!m ztuK;nBnMv}_yCwri<;i6Gp9X&C4)L#Eq1E>RTCXF(d*Xjj zRAZ>On)yO}?;YH$i{}!o{}KPC@E;;u2M1Udf@5v=`<550zSz+bBAlT0fZgK$eH6UA zpHM^u?*?d-ndoE>b?3+k8q1G;ovv4}9%+@N3CAeOv;Ken*HY z%Z@H3pz*`5mH^Q|d))r}=4Jcu?;qNK)L0*ZRcmh*IGhp(xZxFx+ElghF8__^_${A( zvV7H{-*`G3j8Q&^vt7`y=h}y}Pwn2d1jV%$?XKDAzJ2W47v*sLR^HP2xf?isweO+z zho29_Lw6Fr9ENTB2jlcJ-^P6C$UAz`_5kL zpYqA0;jiu=cI2Htu_x%px0^2)KmHNaSgd_^YuSNMJD_|mbIlbG@cRC1-S1$P5m?Uy zJHqsS(h-Pna%Jh>XEFkH{y`tf<9c&O&~1$`qAo7;54#wF2M-<;jt=pg+3d#Q7=f+% zg!$5M&KHb8OhBD~kSfOGbv9;v@78@~_S*9c!FaoRJ9OVOkRObP%c1=K+%w(pRmex2 zRSw2u+-Ksgz06H}i+&zCN8F3O%= 34.9.1 @@ -29,10 +28,10 @@ Requires: lorax >= 34.9.1 Provides: lorax-templates = %{version}-%{release} # Where are these supposed to end up? -%define templatedir %{_datadir}/lorax/templates.d/80-rhel +%define templatedir %{_datadir}/lorax/templates.d/70-msvsphere %description -RHEL-specific Lorax templates for creating the boot.iso and live isos are +MSVSphere 10 Lorax templates for creating the boot.iso and live isos are placed in %{templatedir} %prep @@ -52,6 +51,12 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Thu Jan 02 2025 Arkady L. Shane - 10.0-52.1 +- Isolinux is obsolete, rebase to grub2-bios.cfg +- Update patches +- Drop cp866 font +- Debranding some items + * Mon Dec 23 2024 Sergey Cherevko - 10.0-52 - MSVSphere changes