From f5dc1308f242fa31f16f22b966ed53fc1a9c6519 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 23 Dec 2023 16:22:38 +0300 Subject: [PATCH] - Enable all modules but subscription instead of try to forbid - Do not set locale by default --- .../0006-Add-MSVSphere-product-config.patch | 38 +++++++++++++++---- SPECS/anaconda.spec | 7 +++- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/SOURCES/0006-Add-MSVSphere-product-config.patch b/SOURCES/0006-Add-MSVSphere-product-config.patch index 6f1c6ee..bb03354 100644 --- a/SOURCES/0006-Add-MSVSphere-product-config.patch +++ b/SOURCES/0006-Add-MSVSphere-product-config.patch @@ -1,19 +1,20 @@ -From a875968192c09e4d132f3e2a97977f975ca8ae11 Mon Sep 17 00:00:00 2001 +From 2b516265899d2af961d6b1593b5f530624bbf777 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 19 Dec 2023 12:00:36 +0300 -Subject: [PATCH 06/11] Add MSVSphere product config +Subject: [PATCH] Add MSVSphere product config --- - data/product.d/msvsphere.conf | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) + data/product.d/msvsphere.conf | 30 ++++++++++++++++++++++++++++++ + data/product.d/rhel.conf | 1 - + 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 data/product.d/msvsphere.conf diff --git a/data/product.d/msvsphere.conf b/data/product.d/msvsphere.conf new file mode 100644 -index 0000000..baaf497 +index 0000000..f795db9 --- /dev/null +++ b/data/product.d/msvsphere.conf -@@ -0,0 +1,21 @@ +@@ -0,0 +1,30 @@ +# Anaconda configuration file for MSVSphere. + +[Product] @@ -23,8 +24,17 @@ index 0000000..baaf497 +product_name = Red Hat Enterprise Linux + +[Anaconda] -+forbidden_modules = -+ org.fedoraproject.Anaconda.Modules.Subscription ++# List of enabled Anaconda DBus modules for RHEL. ++# but without org.fedoraproject.Anaconda.Modules.Subscription ++kickstart_modules = ++ org.fedoraproject.Anaconda.Modules.Timezone ++ org.fedoraproject.Anaconda.Modules.Network ++ org.fedoraproject.Anaconda.Modules.Localization ++ org.fedoraproject.Anaconda.Modules.Security ++ org.fedoraproject.Anaconda.Modules.Users ++ org.fedoraproject.Anaconda.Modules.Payloads ++ org.fedoraproject.Anaconda.Modules.Storage ++ org.fedoraproject.Anaconda.Modules.Services + +[Bootloader] +efi_dir = msvsphere @@ -35,6 +45,18 @@ index 0000000..baaf497 + +[License] +eula = /usr/share/sphere-release/EULA +diff --git a/data/product.d/rhel.conf b/data/product.d/rhel.conf +index c4de9b6..3f7e282 100644 +--- a/data/product.d/rhel.conf ++++ b/data/product.d/rhel.conf +@@ -14,7 +14,6 @@ kickstart_modules = + org.fedoraproject.Anaconda.Modules.Payloads + org.fedoraproject.Anaconda.Modules.Storage + org.fedoraproject.Anaconda.Modules.Services +- org.fedoraproject.Anaconda.Modules.Subscription + + [Installation System] + # The detection is disabled since #1645686. -- 2.43.0 diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 1a4548a..ab0af2c 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 33.16.9.4 -Release: 1%{?dist}.inferit +Release: 1%{?dist}.inferit.1 License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -17,7 +17,6 @@ Patch3: 0003-Set-MSVSphere-installer-colors.patch Patch4: 0004-Add-Minimal-and-Server-repository-support.patch Patch5: 0005-Set-default-timezone-to-Europe-Moscow.patch Patch6: 0006-Add-MSVSphere-product-config.patch -Patch7: 0007-Set-Russian-language-as-default.patch Patch8: 0008-Set-Russian-as-default-language-for-new-regions.patch Patch9: 0009-MSVSphere-Adaptation-Patch.patch Patch10: 0010-Fix-smt-url.patch @@ -383,6 +382,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Sat Dec 23 2023 Arkady L. Shane - 33.16.9.4-1.inferit.1 +- Enable all modules but subscription instead of try to forbid +- Do not set locale by default + * Tue Dec 19 2023 Arkady L. Shane - 33.16.9.4-1.inferit - Disable subscription - Hide CDN source button