parent
e04012b229
commit
7baa1f1a77
GPG Key ID:
D87CBBC16D2E4A72
@ -0,0 +1,24 @@
|
||||
From b2cdcabb10b086ccaa265e5ff68a53caaf43dcd1 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
|
||||
Date: Fri, 20 Dec 2024 11:24:03 +0300
|
||||
Subject: [PATCH 1/8] Remove RHEL specific packages
|
||||
|
||||
---
|
||||
80-rhel/runtime-install.tmpl | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
|
||||
index 8f2f3b8..864cc57 100644
|
||||
--- a/80-rhel/runtime-install.tmpl
|
||||
+++ b/80-rhel/runtime-install.tmpl
|
||||
@@ -8,7 +8,6 @@ GRUB2VER="1:2.06-67"
|
||||
|
||||
## anaconda package
|
||||
installpkg anaconda anaconda-widgets kdump-anaconda-addon anaconda-install-img-deps
|
||||
-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
|
||||
--
|
||||
2.43.5
|
||||
|
||||
@ -0,0 +1,73 @@
|
||||
From 734ddc42b648f75a72d4dd490700ee1edce04549 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <arkadiy.sheyn@softline.com>
|
||||
Date: Sat, 29 Jul 2023 21:12:05 +0200
|
||||
Subject: [PATCH 4/8] 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 d36aefa..43d2f11 100644
|
||||
--- a/80-rhel/efi.tmpl
|
||||
+++ b/80-rhel/efi.tmpl
|
||||
@@ -49,9 +49,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 50f95e6..08ba750 100644
|
||||
--- a/80-rhel/live/efi.tmpl
|
||||
+++ b/80-rhel/live/efi.tmpl
|
||||
@@ -49,9 +49,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 c88d657..3221d72 100644
|
||||
--- a/80-rhel/live/x86.tmpl
|
||||
+++ b/80-rhel/live/x86.tmpl
|
||||
@@ -79,7 +79,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.conf
|
||||
replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg
|
||||
replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg
|
||||
replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg
|
||||
-replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg
|
||||
+replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg
|
||||
replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
|
||||
index 608d8ed..e5d9027 100644
|
||||
--- a/80-rhel/x86.tmpl
|
||||
+++ b/80-rhel/x86.tmpl
|
||||
@@ -67,7 +67,7 @@ replace @FLAVOR@ '${FLAVOR}' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg
|
||||
replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg
|
||||
replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg
|
||||
replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg
|
||||
-replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${GRUB2DIR}/grub.cfg
|
||||
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg
|
||||
--
|
||||
2.43.5
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From 219c5085102a61efb0075aa401a57dfb7804c666 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <arkadiy.sheyn@softline.com>
|
||||
Date: Thu, 21 Sep 2023 13:47:02 +0300
|
||||
Subject: [PATCH 5/8] Update title color
|
||||
|
||||
---
|
||||
80-rhel/config_files/x86/isolinux.cfg | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg
|
||||
index 3cfdbc2..86e24b6 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
|
||||
--
|
||||
2.43.5
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From 85d6b9ef141e5d653f246b2e6795e828ee378a88 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <arkadiy.sheyn@softline.com>
|
||||
Date: Sat, 30 Sep 2023 16:42:23 +0300
|
||||
Subject: [PATCH 6/8] Add sphere licenses to live media
|
||||
|
||||
---
|
||||
80-rhel/live/aarch64.tmpl | 2 +-
|
||||
80-rhel/live/x86.tmpl | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/80-rhel/live/aarch64.tmpl b/80-rhel/live/aarch64.tmpl
|
||||
index d1a3f87..64c7f14 100644
|
||||
--- a/80-rhel/live/aarch64.tmpl
|
||||
+++ b/80-rhel/live/aarch64.tmpl
|
||||
@@ -67,7 +67,7 @@ mkdir ${KERNELDIR}
|
||||
%endfor
|
||||
|
||||
# Add the license files
|
||||
-%for f in glob("usr/share/licenses/*-release-common/*"):
|
||||
+%for f in glob("/usr/share/sphere-release/EULA"):
|
||||
install ${f} ${f|basename}
|
||||
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
|
||||
%endfor
|
||||
diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
|
||||
index 3221d72..6c55318 100644
|
||||
--- a/80-rhel/live/x86.tmpl
|
||||
+++ b/80-rhel/live/x86.tmpl
|
||||
@@ -108,7 +108,7 @@ iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg
|
||||
%endfor
|
||||
|
||||
# Add the license files
|
||||
-%for f in glob("usr/share/licenses/*-release-common/*"):
|
||||
+%for f in glob("/usr/share/sphere-release/EULA"):
|
||||
install ${f} ${f|basename}
|
||||
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
|
||||
%endfor
|
||||
--
|
||||
2.43.5
|
||||
|
||||
@ -0,0 +1,73 @@
|
||||
From a3bcb378f63d4347e2bb0604579342dbdca944b4 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <tigro@msvsphere-os.ru>
|
||||
Date: Fri, 19 Jan 2024 16:42:18 +0300
|
||||
Subject: [PATCH 7/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 43d2f11..f7ba0b1 100644
|
||||
--- a/80-rhel/efi.tmpl
|
||||
+++ b/80-rhel/efi.tmpl
|
||||
@@ -49,9 +49,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 08ba750..30d5bc9 100644
|
||||
--- a/80-rhel/live/efi.tmpl
|
||||
+++ b/80-rhel/live/efi.tmpl
|
||||
@@ -49,9 +49,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 6c55318..51c51ee 100644
|
||||
--- a/80-rhel/live/x86.tmpl
|
||||
+++ b/80-rhel/live/x86.tmpl
|
||||
@@ -79,7 +79,7 @@ replace @PRODUCT@ '${product.name}' ${GRUB2DIR}/grub.conf
|
||||
replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg
|
||||
replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg
|
||||
replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg
|
||||
-replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg
|
||||
+replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${GRUB2DIR}/grub.cfg
|
||||
replace @EXTRA@ '${extra_boot_args}' ${GRUB2DIR}/grub.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
|
||||
index e5d9027..a57df5e 100644
|
||||
--- a/80-rhel/x86.tmpl
|
||||
+++ b/80-rhel/x86.tmpl
|
||||
@@ -67,7 +67,7 @@ replace @FLAVOR@ '${FLAVOR}' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg
|
||||
replace @KERNELPATH@ /${KERNELDIR}/vmlinuz ${GRUB2DIR}/grub.cfg
|
||||
replace @INITRDPATH@ /${KERNELDIR}/initrd.img ${GRUB2DIR}/grub.cfg
|
||||
replace @ISOLABEL@ '${isolabel}' ${GRUB2DIR}/grub.cfg
|
||||
-replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${GRUB2DIR}/grub.cfg
|
||||
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0 inst.lang=ru_RU.UTF-8' ${GRUB2DIR}/grub.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
iconv 'cp866' ${GRUB2DIR}/isolinux.cfg ${GRUB2DIR}/*.msg
|
||||
--
|
||||
2.43.5
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From 4a13eb35ae9a695e44c7517934366970c7719879 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <tigro@msvsphere-os.ru>
|
||||
Date: Mon, 12 Aug 2024 20:07:46 +0300
|
||||
Subject: [PATCH 8/8] 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..5366b7f 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..4eff1d3 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.43.5
|
||||
|
||||
Binary file not shown.
Loading…
Reference in new issue