rpms
/
lorax-templates-rhel
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update patch for live bootloader

Browse Source 
- Copy font to live
i9 changed/i9/lorax-templates-msvsphere-9.0-37.el9.4
Arkady L. Shane 1 year ago
parent d6b5971250
commit 31d56efd68
Signed by: tigro
GPG Key ID: 9C7900103E1C4F8B
2 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File

76
SOURCES/0004-Translate-live-image-bootloader-to-Russian.patch
Unescape View File

@ -1,7 +1,21 @@
diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/grub2-efi.cfg lorax-templates-rhel-9.0/80-rhel/live/config_files/x86/grub2-efi.cfg
--- lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/grub2-efi.cfg 2023-07-28 20:35:07.103636648 +0200
+++ lorax-templates-rhel-9.0/80-rhel/live/config_files/x86/grub2-efi.cfg 2023-07-28 20:35:23.085949165 +0200
@@ -9,7 +9,12 @@
From f1e09531491c81d91327d3684193594a355954ae Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Sat, 29 Jul 2023 15:34:37 +0200
Subject: [PATCH 4/4] 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 | 15 +++++++++++-
80-rhel/x86.tmpl | 2 +-
5 files changed, 43 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
@ -14,7 +28,7 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/grub2-efi.
insmod gzio
insmod part_gpt
insmod ext2
@@ -20,11 +25,11 @@
@@ -20,11 +25,11 @@ set timeout=60
search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ###
@ -28,9 +42,10 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/grub2-efi.
linuxefi @KERNELPATH@ @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
initrdefi @INITRDPATH@
}
diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/isolinux.cfg lorax-templates-rhel-9.0/80-rhel/live/config_files/x86/isolinux.cfg
--- lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/isolinux.cfg 2023-07-28 20:35:07.103636648 +0200
+++ lorax-templates-rhel-9.0/80-rhel/live/config_files/x86/isolinux.cfg 2023-07-28 20:35:23.085949165 +0200
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
@ -40,7 +55,7 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/isolinux.c
display boot.msg
# Clear the screen when exiting the menu, instead of leaving the menu displayed.
@@ -8,7 +10,7 @@
@@ -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
@ -49,7 +64,7 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/isolinux.c
menu vshift 8
menu rows 18
menu margin 8
@@ -53,18 +55,18 @@
@@ -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.
@ -71,7 +86,7 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/isolinux.c
menu default
kernel vmlinuz
append initrd=initrd.img @ROOT@ @EXTRA@ rd.live.image rd.live.check quiet
@@ -72,29 +74,30 @@
@@ -72,29 +74,30 @@ label check
menu separator # insert an empty line
# utilities submenu
@ -110,14 +125,15 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/config_files/x86/isolinux.c
menu exit
menu end
diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/efi.tmpl lorax-templates-rhel-9.0/80-rhel/live/efi.tmpl
--- lorax-templates-rhel-9.0.orig/80-rhel/live/efi.tmpl 2023-07-28 20:35:07.103636648 +0200
+++ lorax-templates-rhel-9.0/80-rhel/live/efi.tmpl 2023-07-28 20:35:23.085949165 +0200
@@ -39,7 +39,13 @@
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':
+ %if product.name == 'MSVSphere ARM':
+ replace @PRODUCT@ 'МСВСфера' ${eficonf}
+ replace @FLAVOR@ ' АРМ' ${eficonf}
+ %else:
@ -127,10 +143,11 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/efi.tmpl lorax-templates-rh
replace @VERSION@ ${product.version} ${eficonf}
replace @KERNELNAME@ vmlinuz ${eficonf}
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/x86.tmpl lorax-templates-rhel-9.0/80-rhel/live/x86.tmpl
--- lorax-templates-rhel-9.0.orig/80-rhel/live/x86.tmpl 2023-07-28 20:35:07.104636668 +0200
+++ lorax-templates-rhel-9.0/80-rhel/live/x86.tmpl 2023-07-28 20:35:23.085949165 +0200
@@ -42,12 +42,24 @@
diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
index 473faab..bcfaf53 100644
--- a/80-rhel/live/x86.tmpl
+++ b/80-rhel/live/x86.tmpl
@@ -42,12 +42,25 @@ install ${configdir}/grub.conf ${BOOTDIR}
install usr/share/anaconda/boot/syslinux-splash.png ${BOOTDIR}/splash.png
install boot/memtest* ${BOOTDIR}/memtest
@ -140,11 +157,12 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/x86.tmpl lorax-templates-rh
## 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':
+%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
@ -156,3 +174,19 @@ diff -urN lorax-templates-rhel-9.0.orig/80-rhel/live/x86.tmpl lorax-templates-rh
## 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

7
SPECS/lorax-templates-rhel.spec
Unescape View File

@ -1,6 +1,6 @@
Name: lorax-templates-msvsphere
Version: 9.0
Release: 37%{?dist}.3
Release: 37%{?dist}.4
Summary: MSVSphere 9 build templates for lorax and livemedia-creator
License: GPLv2+
@ -41,12 +41,17 @@ 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
* 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

Write Preview
Loading…
Cancel
Save