- Copy only EULA on live - Added sphere licenses to live media - Update title color - Added translation to bootloader - Added proper image type identification for BaseOS and Minimal variants - Disable geo location - Copy font to livei8 changed/i8/lorax-templates-msvsphere-8.7-1.el8
parent
80e0fdb686
commit
5c28819721
GPG Key ID:
1EC08A25C9DB2503
@ -0,0 +1,32 @@
|
||||
From ce4e1d6f1c13d8efb32fb007ae5faa161d3c0c70 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <tigro@msvsphere-os.ru>
|
||||
Date: Fri, 22 Dec 2023 16:08:54 +0300
|
||||
Subject: [PATCH 1/7] Remove RHEL specific packages
|
||||
|
||||
---
|
||||
80-rhel/runtime-install.tmpl | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
|
||||
index ad9e524..25e7057 100644
|
||||
--- a/80-rhel/runtime-install.tmpl
|
||||
+++ b/80-rhel/runtime-install.tmpl
|
||||
@@ -4,7 +4,6 @@
|
||||
## anaconda package
|
||||
installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-env-deps
|
||||
installpkg oscap-anaconda-addon
|
||||
-installpkg redhat-release-eula
|
||||
|
||||
## Other available payloads
|
||||
installpkg dnf
|
||||
@@ -159,7 +158,6 @@ installpkg google-noto-sans-cjk-ttc-fonts
|
||||
## debugging/bug reporting tools
|
||||
installpkg gdb-gdbserver
|
||||
installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
|
||||
-installpkg libreport-rhel-anaconda-bugzilla
|
||||
installpkg python3-pyatspi
|
||||
|
||||
## extra tools not required by anaconda
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 81febd96e35d9fbe8416cbde938bec37fdac515e Mon Sep 17 00:00:00 2001
|
||||
From: tigro <tigro@msvsphere-os.ru>
|
||||
Date: Fri, 22 Dec 2023 16:09:33 +0300
|
||||
Subject: [PATCH 2/7] Disable oscap-anaconda-addon install
|
||||
|
||||
---
|
||||
80-rhel/runtime-install.tmpl | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
|
||||
index 25e7057..369ab9f 100644
|
||||
--- a/80-rhel/runtime-install.tmpl
|
||||
+++ b/80-rhel/runtime-install.tmpl
|
||||
@@ -3,7 +3,8 @@
|
||||
|
||||
## anaconda package
|
||||
installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-env-deps
|
||||
-installpkg oscap-anaconda-addon
|
||||
+## temporarily disabled on MSVSphere until we have OpenScap integration
|
||||
+# installpkg oscap-anaconda-addon
|
||||
|
||||
## Other available payloads
|
||||
installpkg dnf
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -0,0 +1,73 @@
|
||||
From 6c23329a45a1187606cc65db9eb47c92678e06ea Mon Sep 17 00:00:00 2001
|
||||
From: tigro <tigro@msvsphere-os.ru>
|
||||
Date: Fri, 22 Dec 2023 16:46:00 +0300
|
||||
Subject: [PATCH 5/7] 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 22bd0ba..c34afd0 100644
|
||||
--- a/80-rhel/efi.tmpl
|
||||
+++ b/80-rhel/efi.tmpl
|
||||
@@ -53,9 +53,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 fa18025..f39c89a 100644
|
||||
--- a/80-rhel/live/efi.tmpl
|
||||
+++ b/80-rhel/live/efi.tmpl
|
||||
@@ -53,9 +53,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 6209734..65ed6a3 100644
|
||||
--- a/80-rhel/live/x86.tmpl
|
||||
+++ b/80-rhel/live/x86.tmpl
|
||||
@@ -72,7 +72,7 @@ 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
|
||||
+replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev} inst.geoloc=0' ${BOOTDIR}/isolinux.cfg
|
||||
replace @EXTRA@ '${extra_boot_args}' ${BOOTDIR}/isolinux.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl
|
||||
index 91fd965..b9357b1 100644
|
||||
--- a/80-rhel/x86.tmpl
|
||||
+++ b/80-rhel/x86.tmpl
|
||||
@@ -63,7 +63,7 @@ replace @PRODUCT@ '${product.name}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
%endif
|
||||
replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf
|
||||
replace @FLAVOR@ '${FLAVOR}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
-replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
|
||||
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev} inst.geoloc=0' ${BOOTDIR}/isolinux.cfg
|
||||
|
||||
## convert BIOS bootloader configs to cp866 encoding
|
||||
iconv 'cp866' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
From 2ba3ddfa56185697880bd87d9313c5d6dbab5c66 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <tigro@msvsphere-os.ru>
|
||||
Date: Fri, 22 Dec 2023 16:47:31 +0300
|
||||
Subject: [PATCH 6/7] Update title color
|
||||
|
||||
---
|
||||
80-rhel/config_files/x86/isolinux.cfg | 2 +-
|
||||
80-rhel/live/config_files/x86/isolinux.cfg | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg
|
||||
index 698695a..3025eaa 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
|
||||
diff --git a/80-rhel/live/config_files/x86/isolinux.cfg b/80-rhel/live/config_files/x86/isolinux.cfg
|
||||
index a2253ca..ccd2707 100644
|
||||
--- a/80-rhel/live/config_files/x86/isolinux.cfg
|
||||
+++ b/80-rhel/live/config_files/x86/isolinux.cfg
|
||||
@@ -23,7 +23,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.0
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
From deda2347d8070c033c14e707f238b1bd48c6de96 Mon Sep 17 00:00:00 2001
|
||||
From: tigro <tigro@msvsphere-os.ru>
|
||||
Date: Fri, 22 Dec 2023 16:48:22 +0300
|
||||
Subject: [PATCH 7/7] Add sphere licenses to live media
|
||||
|
||||
---
|
||||
80-rhel/live/x86.tmpl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/80-rhel/live/x86.tmpl b/80-rhel/live/x86.tmpl
|
||||
index 65ed6a3..43cb004 100644
|
||||
--- a/80-rhel/live/x86.tmpl
|
||||
+++ b/80-rhel/live/x86.tmpl
|
||||
@@ -138,7 +138,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
|
||||
%endfor
|
||||
|
||||
# Add the license files
|
||||
-%for f in glob("/usr/share/licenses/*-release/*"):
|
||||
+%for f in glob("/usr/share/sphere-release/EULA"):
|
||||
install ${f} ${f|basename}
|
||||
<% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
|
||||
%endfor
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Loading…
Reference in new issue