|
|
|
@ -1,15 +1,90 @@
|
|
|
|
|
From 6a2fe8be7df46482666162d7b71d26ca0ed0afbe Mon Sep 17 00:00:00 2001
|
|
|
|
|
From ea989db77f31ff2b5d332216f96c18d349eff4ee 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
|
|
|
|
|
Subject: [PATCH 3/7] 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(-)
|
|
|
|
|
80-rhel/aarch64.tmpl | 12 ++++++-
|
|
|
|
|
80-rhel/config_files/aarch64/grub2-efi.cfg | 15 +++++---
|
|
|
|
|
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 +++++++++++--
|
|
|
|
|
6 files changed, 85 insertions(+), 32 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/80-rhel/aarch64.tmpl b/80-rhel/aarch64.tmpl
|
|
|
|
|
index 2893a50..b6dc04a 100644
|
|
|
|
|
--- a/80-rhel/aarch64.tmpl
|
|
|
|
|
+++ b/80-rhel/aarch64.tmpl
|
|
|
|
|
@@ -15,6 +15,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
|
|
|
|
|
@@ -47,7 +57,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"/>
|
|
|
|
|
+ <%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
|
|
|
|
|
diff --git a/80-rhel/config_files/aarch64/grub2-efi.cfg b/80-rhel/config_files/aarch64/grub2-efi.cfg
|
|
|
|
|
index 80db480..5d7ab99 100644
|
|
|
|
|
--- a/80-rhel/config_files/aarch64/grub2-efi.cfg
|
|
|
|
|
+++ b/80-rhel/config_files/aarch64/grub2-efi.cfg
|
|
|
|
|
@@ -15,7 +15,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
|
|
|
|
|
@@ -26,20 +31,20 @@ set timeout=60
|
|
|
|
|
search --no-floppy --set=root -l '@ISOLABEL@'
|
|
|
|
|
|
|
|
|
|
### BEGIN /etc/grub.d/10_linux ###
|
|
|
|
|
-menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
|
|
|
|
+menuentry 'Установить @PRODUCT@ @VERSION@@FLAVOR@' --class fedora --class gnu-linux --class gnu --class os {
|
|
|
|
|
linux @KERNELPATH@ @ROOT@ ro
|
|
|
|
|
initrd @INITRDPATH@
|
|
|
|
|
}
|
|
|
|
|
-menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --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
|
|
|
|
|
initrd @INITRDPATH@
|
|
|
|
|
}
|
|
|
|
|
-submenu 'Troubleshooting -->' {
|
|
|
|
|
- menuentry 'Install @PRODUCT@ @VERSION@ in text mode' --class red --class gnu-linux --class gnu --class os {
|
|
|
|
|
+submenu 'Устранение неполадок -->' {
|
|
|
|
|
+ menuentry 'Установить @PRODUCT@ @VERSION@@FLAVOR@ (текстовый установщик)' --class fedora --class gnu-linux --class gnu --class os {
|
|
|
|
|
linux @KERNELPATH@ @ROOT@ inst.text
|
|
|
|
|
initrd @INITRDPATH@
|
|
|
|
|
}
|
|
|
|
|
- menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
|
|
|
|
|
+ menuentry 'Восстановление установленной системы' --class fedora --class gnu-linux --class gnu --class os {
|
|
|
|
|
linux @KERNELPATH@ @ROOT@ inst.rescue
|
|
|
|
|
initrd @INITRDPATH@
|
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
@ -259,5 +334,5 @@ index 3d9d0a4..2717f2c 100644
|
|
|
|
|
|
|
|
|
|
# Create optional product.img and updates.img
|
|
|
|
|
--
|
|
|
|
|
2.46.0
|
|
|
|
|
2.47.0
|
|
|
|
|
|
|
|
|
|