|
|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
From 4796511e7883d320a0daeae8c2eaa50999e92992 Mon Sep 17 00:00:00 2001
|
|
|
|
|
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
|
|
|
|
|
@ -7,11 +7,11 @@ 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 | 23 +++++++++++++--
|
|
|
|
|
4 files changed, 62 insertions(+), 26 deletions(-)
|
|
|
|
|
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..dfd827f 100644
|
|
|
|
|
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 {
|
|
|
|
|
@ -54,7 +54,7 @@ index 5fc47de..dfd827f 100644
|
|
|
|
|
initrdefi @INITRDPATH@
|
|
|
|
|
}
|
|
|
|
|
diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg
|
|
|
|
|
index 01bf0cd..0cad3c2 100644
|
|
|
|
|
index 01bf0cd..6220975 100644
|
|
|
|
|
--- a/80-rhel/config_files/x86/isolinux.cfg
|
|
|
|
|
+++ b/80-rhel/config_files/x86/isolinux.cfg
|
|
|
|
|
@@ -1,6 +1,8 @@
|
|
|
|
|
@ -165,7 +165,7 @@ index 01bf0cd..0cad3c2 100644
|
|
|
|
|
|
|
|
|
|
menu end
|
|
|
|
|
diff --git a/80-rhel/efi.tmpl b/80-rhel/efi.tmpl
|
|
|
|
|
index bb1aa4f..dda0e79 100644
|
|
|
|
|
index bb1aa4f..172f27c 100644
|
|
|
|
|
--- a/80-rhel/efi.tmpl
|
|
|
|
|
+++ b/80-rhel/efi.tmpl
|
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
|
@ -204,10 +204,10 @@ index bb1aa4f..dda0e79 100644
|
|
|
|
|
replace @KERNELNAME@ vmlinuz ${eficonf}
|
|
|
|
|
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
|
|
|
|
|
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
|
|
|
|
|
index 3d9d0a4..be49189 100644
|
|
|
|
|
index 3d9d0a4..2717f2c 100644
|
|
|
|
|
--- a/80-rhel/x86.tmpl
|
|
|
|
|
+++ b/80-rhel/x86.tmpl
|
|
|
|
|
@@ -23,6 +23,14 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
|
|
|
|
@@ -23,6 +23,16 @@ if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
|
|
|
|
|
isoargs = "-iso-level 3"
|
|
|
|
|
else:
|
|
|
|
|
isoargs = ""
|
|
|
|
|
@ -215,6 +215,8 @@ index 3d9d0a4..be49189 100644
|
|
|
|
|
+# 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:
|
|
|
|
|
@ -222,7 +224,7 @@ index 3d9d0a4..be49189 100644
|
|
|
|
|
%>
|
|
|
|
|
|
|
|
|
|
mkdir images
|
|
|
|
|
@@ -41,12 +49,23 @@ install ${configdir}/boot.msg ${BOOTDIR}
|
|
|
|
|
@@ -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
|
|
|
|
|
@ -247,7 +249,7 @@ index 3d9d0a4..be49189 100644
|
|
|
|
|
## install kernels
|
|
|
|
|
mkdir ${KERNELDIR}
|
|
|
|
|
%for kernel in kernels:
|
|
|
|
|
@@ -90,7 +109,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
|
|
|
|
|
@@ -90,7 +111,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
|
|
|
|
|
%>
|
|
|
|
|
treeinfo images-${basearch} ${img|basename} ${img}
|
|
|
|
|
%endfor
|
|
|
|
|
@ -257,5 +259,5 @@ index 3d9d0a4..be49189 100644
|
|
|
|
|
|
|
|
|
|
# Create optional product.img and updates.img
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
2.46.0
|
|
|
|
|
|
|
|
|
|
|
