|
|
|
|
@ -1,14 +1,14 @@
|
|
|
|
|
From d6e9b1e138fb12a4c29e381ac6c358a196e7c5d8 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 953c0d9d3a23ca9218ec712660e802693a3913e7 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: tigro <tigro@msvsphere-os.ru>
|
|
|
|
|
Date: Fri, 22 Dec 2023 16:29:51 +0300
|
|
|
|
|
Subject: [PATCH 3/7] Translate installation image bootloader to Russian
|
|
|
|
|
Subject: [PATCH 3/4] Translate installation image bootloader to Russian
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
80-rhel/config_files/x86/grub2-efi.cfg | 15 ++++++----
|
|
|
|
|
80-rhel/config_files/x86/isolinux.cfg | 40 +++++++++++++++-----------
|
|
|
|
|
80-rhel/efi.tmpl | 7 +++++
|
|
|
|
|
80-rhel/x86.tmpl | 23 +++++++++++++--
|
|
|
|
|
4 files changed, 61 insertions(+), 24 deletions(-)
|
|
|
|
|
80-rhel/x86.tmpl | 24 ++++++++++++++--
|
|
|
|
|
4 files changed, 62 insertions(+), 24 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg
|
|
|
|
|
index 8c9adad..5a7b61f 100644
|
|
|
|
|
@ -198,10 +198,15 @@ index d73d2d7..22bd0ba 100644
|
|
|
|
|
replace @KERNELNAME@ vmlinuz ${eficonf}
|
|
|
|
|
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
|
|
|
|
|
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
|
|
|
|
|
index 1b0a940..d5782c5 100644
|
|
|
|
|
index 1b0a940..161934a 100644
|
|
|
|
|
--- a/80-rhel/x86.tmpl
|
|
|
|
|
+++ b/80-rhel/x86.tmpl
|
|
|
|
|
@@ -25,6 +25,14 @@ from os.path import basename
|
|
|
|
|
@@ -1,3 +1,4 @@
|
|
|
|
|
+# -*- coding: utf-8 -*-
|
|
|
|
|
<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, product, isolabel"/>
|
|
|
|
|
<%
|
|
|
|
|
configdir="tmp/config_files/x86"
|
|
|
|
|
@@ -25,6 +26,14 @@ from os.path import basename
|
|
|
|
|
udfargs = "-allow-limited-size"
|
|
|
|
|
else:
|
|
|
|
|
udfargs = ""
|
|
|
|
|
@ -216,7 +221,7 @@ index 1b0a940..d5782c5 100644
|
|
|
|
|
%>
|
|
|
|
|
|
|
|
|
|
mkdir images
|
|
|
|
|
@@ -43,12 +51,23 @@ install ${configdir}/boot.msg ${BOOTDIR}
|
|
|
|
|
@@ -43,12 +52,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
|
|
|
|
|
@ -241,7 +246,7 @@ index 1b0a940..d5782c5 100644
|
|
|
|
|
## install kernels
|
|
|
|
|
mkdir ${KERNELDIR}
|
|
|
|
|
%for kernel in kernels:
|
|
|
|
|
@@ -93,7 +112,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
|
|
|
|
|
@@ -93,7 +113,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
|
|
|
|
|
treeinfo images-${basearch} ${img|basename} ${img}
|
|
|
|
|
%endfor
|
|
|
|
|
<% efihybrid = "--uefi --mac" if domacboot else "--uefi" %>
|
|
|
|
|
|
