Compare commits

...

No commits in common. 'c9' and 'i9-certified' have entirely different histories.

@ -1 +1,2 @@
b570dd409ac7d937f64784c2acaa838fde18d9ff SOURCES/lorax-templates-rhel-9.0-37.tar.gz
c72e58401cbac2fee8ca654043bdf1bdf8f40021 SOURCES/cp866-8x16.psf

@ -0,0 +1,32 @@
From dd7b1dd0d76705edd95a1268ecd41b7fdbe2a38a Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Thu, 6 Apr 2023 23:34:20 +0300
Subject: [PATCH 1/3] Remove RHEL specific packages
---
80-rhel/runtime-install.tmpl | 2 --
1 file changed, 2 deletions(-)
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index ac3fe06..1189a49 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -4,7 +4,6 @@
## anaconda package
installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps
installpkg oscap-anaconda-addon
-installpkg redhat-release-eula
## FIXME Pull in device-mapper-multipath
## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not
@@ -163,7 +162,6 @@ installpkg google-noto-sans-cjk-ttc-fonts
## debugging/bug reporting tools
installpkg gdb-gdbserver
installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
-installpkg libreport-rhel-anaconda-bugzilla
installpkg python3-pyatspi
## extra tools not required by anaconda
--
2.40.1

@ -0,0 +1,26 @@
From 8dc671f22d6ace3263426d1c9066a61856e27961 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Sun, 16 Apr 2023 23:17:19 +0300
Subject: [PATCH 2/3] Disable oscap-anaconda-addon install
---
80-rhel/runtime-install.tmpl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index 1189a49..cd6feea 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -3,7 +3,8 @@
## anaconda package
installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps
-installpkg oscap-anaconda-addon
+## temporarily disabled on MSVSphere until we have OpenScap integration
+# installpkg oscap-anaconda-addon
## FIXME Pull in device-mapper-multipath
## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not
--
2.40.1

@ -0,0 +1,263 @@
From 6a2fe8be7df46482666162d7b71d26ca0ed0afbe Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <evgeniy.zamriy@softline.com>
Date: Wed, 26 Jul 2023 23:51:00 +0300
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 | 41 +++++++++++++++-----------
80-rhel/efi.tmpl | 9 +++++-
80-rhel/x86.tmpl | 25 ++++++++++++++--
4 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg
index 5fc47de..1ac9995 100644
--- a/80-rhel/config_files/x86/grub2-efi.cfg
+++ b/80-rhel/config_files/x86/grub2-efi.cfg
@@ -9,7 +9,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
@@ -20,20 +25,20 @@ 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 {
linuxefi @KERNELPATH@ @ROOT@ quiet
initrdefi @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 {
linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet
initrdefi @INITRDPATH@
}
-submenu 'Troubleshooting -->' {
- menuentry 'Install @PRODUCT@ @VERSION@ in text mode' --class fedora --class gnu-linux --class gnu --class os {
+submenu 'Устранение неполадок -->' {
+ menuentry 'Установить @PRODUCT@ @VERSION@@FLAVOR@ (текстовый установщик)' --class fedora --class gnu-linux --class gnu --class os {
linuxefi @KERNELPATH@ @ROOT@ inst.text quiet
initrdefi @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 {
linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet
initrdefi @INITRDPATH@
}
diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg
index 01bf0cd..6220975 100644
--- a/80-rhel/config_files/x86/isolinux.cfg
+++ b/80-rhel/config_files/x86/isolinux.cfg
@@ -1,6 +1,8 @@
default vesamenu.c32
timeout 600
+font cp866-8x16.psf
+
display boot.msg
# Clear the screen when exiting the menu, instead of leaving the menu displayed.
@@ -8,7 +10,7 @@ display boot.msg
# the menu itself for as long as the screen remains in graphics mode.
menu clear
menu background splash.png
-menu title @PRODUCT@ @VERSION@
+menu title @PRODUCT@ @VERSION@@FLAVOR@
menu vshift 8
menu rows 18
menu margin 8
@@ -53,18 +55,18 @@ menu color cmdline 0 #ffffffff #00000000 none
# Do not display the actual menu unless the user presses a key. All that is displayed is a timeout message.
-menu tabmsg Press Tab for full configuration options on menu items.
+menu tabmsg Нажмите [Tab] для просмотра конфигурации выбранного пункта меню.
menu separator # insert an empty line
menu separator # insert an empty line
label linux
- menu label ^Install @PRODUCT@ @VERSION@
+ menu label ^1. Установить @PRODUCT@ @VERSION@@FLAVOR@
kernel vmlinuz
append initrd=initrd.img @ROOT@ quiet
label check
- menu label Test this ^media & install @PRODUCT@ @VERSION@
+ menu label ^2. Проверить носитель и установить @PRODUCT@ @VERSION@@FLAVOR@
menu default
kernel vmlinuz
append initrd=initrd.img @ROOT@ rd.live.check quiet
@@ -72,49 +74,52 @@ label check
menu separator # insert an empty line
# utilities submenu
-menu begin ^Troubleshooting
- menu title Troubleshooting
+menu begin Устранение неполадок
+ menu title Устранение неполадок
+ menu label ^3. Устранение неполадок
label text
menu indent count 5
- menu label Install @PRODUCT@ @VERSION@ using ^text mode
+ menu label ^1. Установить @PRODUCT@ @VERSION@@FLAVOR@ (текстовый установщик)
text help
- Try this option out if you're having trouble installing
- @PRODUCT@ @VERSION@.
+ Попробуйте этот режим если у вас возникают проблемы с
+ установкой @PRODUCT@ @VERSION@@FLAVOR@.
endtext
kernel vmlinuz
append initrd=initrd.img @ROOT@ inst.text quiet
label rescue
menu indent count 5
- menu label ^Rescue a @PRODUCT@ system
+ menu label ^2. Восстановление установленной системы
text help
- If the system will not boot, this lets you access files
- and edit config files to try to get it booting again.
+ Если система не загружается, данный режим позволит вам
+ получить доступ к файловой системе и отредактировать
+ конфигурационные файлы чтобы восстановить функцию
+ загрузки системы.
endtext
kernel vmlinuz
append initrd=initrd.img @ROOT@ inst.rescue quiet
label memtest
- menu label Run a ^memory test
+ menu label ^3. Запустить тест оперативной памяти
text help
- If your system is having issues, a problem with your
- system's memory may be the cause. Use this utility to
- see if the memory is working correctly.
+ Проблемы со стабильностью операционной системы могут
+ быть вызваны неисправностью оперативной памяти. Эта
+ утилита позволяет проверить корректность работы ОЗУ.
endtext
kernel memtest
menu separator # insert an empty line
label local
- menu label Boot from ^local drive
+ menu label ^4. Загрузка с локального диска
localboot 0xffff
menu separator # insert an empty line
menu separator # insert an empty line
label returntomain
- menu label Return to ^main menu
+ menu label ^0. Вернуться в главное меню
menu exit
menu end
diff --git a/80-rhel/efi.tmpl b/80-rhel/efi.tmpl
index bb1aa4f..172f27c 100644
--- a/80-rhel/efi.tmpl
+++ b/80-rhel/efi.tmpl
@@ -1,4 +1,4 @@
-<%page args="configdir, KERNELDIR, efiarch32, efiarch64, isolabel"/>
+<%page args="configdir, KERNELDIR, efiarch32, efiarch64, isolabel, FLAVOR=''"/>
<%
EFIBOOTDIR="EFI/BOOT"
APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns"
@@ -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 boot/grub2/fonts/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")}
@@ -39,7 +41,12 @@ ${make_efiboot("images/efiboot.img")}
copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
%endif
install ${configdir}/grub2-efi.cfg ${eficonf}
+ replace @FLAVOR@ '${FLAVOR}' ${eficonf}
+ %if product.name in ("MSVSphere", "MSVSphere Server"):
+ replace @PRODUCT@ 'МСВСфера' ${eficonf}
+ %else:
replace @PRODUCT@ '${product.name}' ${eficonf}
+ %endif
replace @VERSION@ ${product.version} ${eficonf}
replace @KERNELNAME@ vmlinuz ${eficonf}
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
index 3d9d0a4..2717f2c 100644
--- a/80-rhel/x86.tmpl
+++ b/80-rhel/x86.tmpl
@@ -23,6 +23,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 images
@@ -41,12 +51,23 @@ install ${configdir}/boot.msg ${BOOTDIR}
install ${configdir}/grub.conf ${BOOTDIR}
install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png
install boot/memtest* ${BOOTDIR}/memtest
+## add a console font with Russian (cp866) encoding support
+install ${configdir}/cp866-8x16.psf ${BOOTDIR}
## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
-replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%if product.name == 'MSVSphere':
+replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%else:
+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}' ${BOOTDIR}/isolinux.cfg
+## convert BIOS bootloader configs to cp866 encoding
+iconv 'cp866' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+
## install kernels
mkdir ${KERNELDIR}
%for kernel in kernels:
@@ -90,7 +111,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%>
treeinfo images-${basearch} ${img|basename} ${img}
%endfor
- <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
+ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel, FLAVOR=FLAVOR"/>
%endif
# Create optional product.img and updates.img
--
2.46.0

@ -0,0 +1,208 @@
From 54d9c3bb700838579d1d329bdbdeae4372d76669 Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Sat, 29 Jul 2023 15:34:37 +0200
Subject: [PATCH] Translate live image bootloader to Russian
---
80-rhel/live/config_files/x86/grub2-efi.cfg | 9 ++++--
80-rhel/live/config_files/x86/isolinux.cfg | 27 ++++++++++--------
80-rhel/live/efi.tmpl | 6 ++++
80-rhel/live/x86.tmpl | 31 ++++++++++++++++++++-
80-rhel/x86.tmpl | 2 +-
5 files changed, 59 insertions(+), 16 deletions(-)
diff --git a/80-rhel/live/config_files/x86/grub2-efi.cfg b/80-rhel/live/config_files/x86/grub2-efi.cfg
index 89a74ea..f26d4e6 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 {
}
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
@@ -20,11 +25,11 @@ 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 {
linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image quiet
initrdefi @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 {
linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
initrdefi @INITRDPATH@
}
diff --git a/80-rhel/live/config_files/x86/isolinux.cfg b/80-rhel/live/config_files/x86/isolinux.cfg
index 324008a..add6f5b 100644
--- a/80-rhel/live/config_files/x86/isolinux.cfg
+++ b/80-rhel/live/config_files/x86/isolinux.cfg
@@ -1,6 +1,8 @@
default vesamenu.c32
timeout 600
+font cp866-8x16.psf
+
display boot.msg
# Clear the screen when exiting the menu, instead of leaving the menu displayed.
@@ -8,7 +10,7 @@ display boot.msg
# the menu itself for as long as the screen remains in graphics mode.
menu clear
menu background splash.png
-menu title @PRODUCT@ @VERSION@
+menu title @PRODUCT@ @VERSION@@FLAVOR@
menu vshift 8
menu rows 18
menu margin 8
@@ -53,18 +55,18 @@ menu color cmdline 0 #ffffffff #00000000 none
# Do not display the actual menu unless the user presses a key. All that is displayed is a timeout message.
-menu tabmsg Press Tab for full configuration options on menu items.
+menu tabmsg Нажмите [Tab] для просмотра конфигурации выбранного пункта меню.
menu separator # insert an empty line
menu separator # insert an empty line
label linux
- menu label ^Start @PRODUCT@ @VERSION@
+ menu label ^1. Запустить @PRODUCT@ @VERSION@@FLAVOR@
kernel vmlinuz
append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image quiet
label check
- menu label Test this ^media & start @PRODUCT@ @VERSION@
+ menu label ^2. Проверить носитель и запустить @PRODUCT@ @VERSION@@FLAVOR@
menu default
kernel vmlinuz
append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
@@ -72,29 +74,30 @@ label check
menu separator # insert an empty line
# utilities submenu
-menu begin ^Troubleshooting
- menu title Troubleshooting
+menu begin Устранение неполадок
+ menu title Устранение неполадок
+ menu label ^3. Устранение неполадок
label memtest
- menu label Run a ^memory test
+ menu label ^3. Запустить тест оперативной памяти
text help
- If your system is having issues, a problem with your
- system's memory may be the cause. Use this utility to
- see if the memory is working correctly.
+ Проблемы со стабильностью операционной системы могут
+ быть вызваны неисправностью оперативной памяти. Эта
+ утилита позволяет проверить корректность работы ОЗУ.
endtext
kernel memtest
menu separator # insert an empty line
label local
- menu label Boot from ^local drive
+ menu label ^4. Загрузка с локального диска
localboot 0xffff
menu separator # insert an empty line
menu separator # insert an empty line
label returntomain
- menu label Return to ^main menu
+ menu label ^0. Вернуться в главное меню
menu exit
menu end
diff --git a/80-rhel/live/efi.tmpl b/80-rhel/live/efi.tmpl
index 42d18f4..806e602 100644
--- a/80-rhel/live/efi.tmpl
+++ b/80-rhel/live/efi.tmpl
@@ -39,7 +39,13 @@ ${make_efiboot("images/efiboot.img")}
copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
%endif
install ${configdir}/grub2-efi.cfg ${eficonf}
+ %if product.name == 'MSVSphere ARM':
+ replace @PRODUCT@ 'МСВСфера' ${eficonf}
+ replace @FLAVOR@ ' АРМ' ${eficonf}
+ %else:
replace @PRODUCT@ '${product.name}' ${eficonf}
+ replace @FLAVOR@ '' ${eficonf}
+ %endif
replace @VERSION@ ${product.version} ${eficonf}
replace @KERNELNAME@ vmlinuz ${eficonf}
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
index 473faab..c4c2c20 100644
--- a/80-rhel/live/x86.tmpl
+++ b/80-rhel/live/x86.tmpl
@@ -42,12 +42,41 @@ install ${configdir}/grub.conf ${BOOTDIR}
install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png
install boot/memtest* ${BOOTDIR}/memtest
+## add a console font with Russian (cp866) encoding support
+install ${configdir}/cp866-8x16.psf ${BOOTDIR}
+
## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
-replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%if product.name == 'MSVSphere GNOME':
+replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+replace @FLAVOR@ ' GNOME' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%endif
+%if product.name == 'MSVSphere Cinnamon':
+replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+replace @FLAVOR@ ' Cinnamon' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%endif
+%if product.name == 'MSVSphere KDE':
+replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+replace @FLAVOR@ ' KDE' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%endif
+%if product.name == 'MSVSphere XFCE':
+replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+replace @FLAVOR@ ' XFCE' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%endif
+%if product.name == 'MSVSphere ARM':
+replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+replace @FLAVOR@ ' АРМ' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+%else:
+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}' ${BOOTDIR}/isolinux.cfg
replace @EXTRA@ '${extra_boot_args}' ${BOOTDIR}/isolinux.cfg
+## convert BIOS bootloader configs to cp866 encoding
+iconv 'cp866' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+
## install kernels
mkdir ${KERNELDIR}
%for kernel in kernels:
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
index be49189..4de8bf8 100644
--- a/80-rhel/x86.tmpl
+++ b/80-rhel/x86.tmpl
@@ -54,7 +54,7 @@ install ${configdir}/cp866-8x16.psf ${BOOTDIR}
## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
-%if product.name == 'MSVSphere':
+%if product.name in ("MSVSphere", "MSVSphere Server"):
replace @PRODUCT@ 'МСВСфера' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
%else:
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
--
2.41.0

@ -0,0 +1,73 @@
From e4c5d0c83aa43aa5d644e025352b5ed90cb8043e Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Sat, 29 Jul 2023 21:12:05 +0200
Subject: [PATCH 5/5] Disable geo location
---
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 172f27c..436d547 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 ${eficonf}
+ replace @ROOT@ 'inst.stage2=hd:LABEL=ANACONDA inst.geoloc=0' ${eficonf}
%else:
- replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf}
+ replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${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 806e602..a225a88 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 ${eficonf}
+ replace @ROOT@ 'root=live:LABEL=ANACONDA inst.geoloc=0' ${eficonf}
%else:
- replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf}
+ replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${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 bcfaf53..516e147 100644
--- a/80-rhel/live/x86.tmpl
+++ b/80-rhel/live/x86.tmpl
@@ -55,7 +55,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}' ${BOOTDIR}/isolinux.cfg
+replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${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 4de8bf8..e5d02cb 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}' ${BOOTDIR}/isolinux.cfg
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${BOOTDIR}/isolinux.cfg
## convert BIOS bootloader configs to cp866 encoding
iconv 'cp866' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
--
2.41.0

@ -0,0 +1,39 @@
From f97059d3616f21710747f0c374a359f7fa25f4e7 Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Thu, 21 Sep 2023 13:47:02 +0300
Subject: [PATCH 6/6] Update title color
---
80-rhel/config_files/x86/isolinux.cfg | 2 +-
80-rhel/live/config_files/x86/isolinux.cfg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg
index ea10f9d..dddfed3 100644
--- a/80-rhel/config_files/x86/isolinux.cfg
+++ b/80-rhel/config_files/x86/isolinux.cfg
@@ -25,7 +25,7 @@ menu color border * #00000000 #00000000 none
menu color sel 0 #ffffffff #00000000 none
# Title bar
-menu color title 0 #ff7ba3d0 #00000000 none
+menu color title 0 #ffcc00cc #00000000 none
# Press [Tab] message
menu color tabmsg 0 #ff3a6496 #00000000 none
diff --git a/80-rhel/live/config_files/x86/isolinux.cfg b/80-rhel/live/config_files/x86/isolinux.cfg
index add6f5b..99e4db2 100644
--- a/80-rhel/live/config_files/x86/isolinux.cfg
+++ b/80-rhel/live/config_files/x86/isolinux.cfg
@@ -25,7 +25,7 @@ menu color border * #00000000 #00000000 none
menu color sel 0 #ffffffff #00000000 none
# Title bar
-menu color title 0 #ff7ba3d0 #00000000 none
+menu color title 0 #ffcc00cc #00000000 none
# Press [Tab] message
menu color tabmsg 0 #ff3a6496 #00000000 none
--
2.41.0

@ -0,0 +1,25 @@
From b8f496cf30e61c650fb416df9fb140b8148500fe Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Sat, 30 Sep 2023 16:42:23 +0300
Subject: [PATCH 7/7] Add sphere licenses to live media
---
80-rhel/live/x86.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
index 6e10da4..0b92fd6 100644
--- a/80-rhel/live/x86.tmpl
+++ b/80-rhel/live/x86.tmpl
@@ -136,7 +136,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%endfor
# Add the license files
-%for f in glob("/usr/share/licenses/*-release/*"):
+%for f in glob("/usr/share/sphere-release/EULA"):
install ${f} ${f|basename}
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
%endfor
--
2.41.0

@ -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

@ -0,0 +1,28 @@
From 53aee1d12cd394f48ec4c96f31bbdd1ea06b5f10 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 12 Aug 2024 20:07:46 +0300
Subject: [PATCH 9/9] Set LatGrkCyr-8x16 as default font instead of eurlatgr
---
80-rhel/config_files/common/i18n | 2 +-
80-rhel/config_files/common/vconsole.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/80-rhel/config_files/common/i18n b/80-rhel/config_files/common/i18n
index b254232..7b4682c 100644
--- a/80-rhel/config_files/common/i18n
+++ b/80-rhel/config_files/common/i18n
@@ -1 +1 @@
-SYSFONT="eurlatgr"
+SYSFONT="latarcyrheb-sun16"
diff --git a/80-rhel/config_files/common/vconsole.conf b/80-rhel/config_files/common/vconsole.conf
index 2bd7892..1456d03 100644
--- a/80-rhel/config_files/common/vconsole.conf
+++ b/80-rhel/config_files/common/vconsole.conf
@@ -1,2 +1,2 @@
KEYMAP=us
-FONT=eurlatgr
+FONT=latarcyrheb-sun16
--
2.46.0

@ -1,25 +1,47 @@
Name: lorax-templates-rhel
Name: lorax-templates-msvsphere
Version: 9.0
Release: 37%{?dist}
Summary: RHEL8 build templates for lorax and livemedia-creator
Release: 37%{?dist}.101.certified
Summary: MSVSphere 9 build templates for lorax and livemedia-creator
License: GPLv2+
URL: https://github.com/weldr/lorax
BuildArch: noarch
Source0: lorax-templates-rhel-9.0-37.tar.gz
Source1: cp866-8x16.psf
# MSVSphere patches
Patch1001: 0001-Remove-RHEL-specific-packages.patch
Patch1002: 0002-Disable-oscap-anaconda-addon-install.patch
Patch1003: 0003-Translate-installation-image-bootloader-to-Russian.patch
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
Patch1009: 0009-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch
# Required for the template branding support
Requires: lorax >= 34.9.1
# Required for Russian localization
Requires: lorax >= 34.9.23-1.el9.inferit.1
# 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 9 Lorax templates for creating the boot.iso and live isos are
placed in %{templatedir}
%prep
%setup
%setup -n lorax-templates-rhel-%{version}
%patch1001 -p1
%patch1002 -p1
%patch1003 -p1
%patch1004 -p1
%patch1005 -p1
%patch1006 -p1
%patch1007 -p1
%patch1008 -p1
%patch1009 -p1
%build
# nothing to build
@ -28,12 +50,71 @@ placed in %{templatedir}
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{templatedir}
cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/config_files/x86/
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{templatedir}/live/config_files/x86/
%files
%dir %{templatedir}
%{templatedir}/*
%changelog
* Sat Sep 14 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.101.certified
- Use latarcyrheb-sun16 font
* Sat Sep 14 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.100.certified
- Added Certified Flavour
* Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.14
- INF-1392: Set LatGrkCyr-8x16 as default font instead of eurlatgr
* Mon Feb 05 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.13
- INF-1034: Drop Distribution name from Recovery menu
* Fri Jan 19 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.12
- Apply patch
* 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
* Sat Sep 30 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.9
- Added sphere licenses to live media
* Thu Sep 21 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.8
- Apply missing patch
* Thu Sep 21 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 9.0-37.7
- Update title color
- Update translation
* Mon Aug 21 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 9.0-37.6
- Added more products
* Sat Jul 29 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 9.0-37.5
- Disable geo location
* Fri Jul 28 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 9.0-37.4
- Update patch for live bootloader
- Copy font to live
* Fri Jul 28 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 9.0-37.3
- Added Russian translation to live bootloader
* Fri Jul 28 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 9.0-37.2
- Added proper image type identification for BaseOS and Minimal variants
* Wed Jul 26 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 9.0-37.1
- Translated BIOS and EFI installation image bootloaders to Russian
- Added bootloader font with cp866 encoding support
* Sat Jul 01 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 9.0-37
- Package renamed to lorax-templates-msvsphere
- Removed RHEL-specific packages from templates
- Temporarily disabled oscap-anaconda-addon installation
- Rebuilt for MSVSphere 9.2
* Wed Jan 11 2023 Brian C. Lane <bcl@redhat.com> - 9.0-37
- rsyslog.conf: Set WorkDirectory to /var/lib/rsyslog (bcl)
Resolves: rhbz#2160070

Loading…
Cancel
Save