Sets default tz to Europe/Moscow and disables Security module

There is no reason to show Security module until we have OpenScap
adopted for our distribution
al changed/i9/anaconda-34.25.1.14-1.el9.inferit.1
Eugene Zamriy 1 year ago
parent da7df273c4
commit 23a0c6c303
Signed by: ezamriy
GPG Key ID: 7EBF95C7DCFA496C

@ -1,7 +1,7 @@
From 73155661b46fdf9a594a81f7b17503e8556e2f6b Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 22:57:50 +0300
Subject: [PATCH 1/6] Disable subscription
Subject: [PATCH 1/7] Disable subscription
---
pyanaconda/ui/gui/spokes/subscription.py | 4 ++++

@ -1,7 +1,7 @@
From 25eee641eba7207fd9ea96435ed85396f5f4c23b Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 23:09:28 +0300
Subject: [PATCH 2/6] Hide CDN source button
Subject: [PATCH 2/7] Hide CDN source button
---
pyanaconda/ui/gui/spokes/installation_source.py | 2 ++

@ -1,7 +1,7 @@
From 0d594c013ed36cdff18019650cb279c65f64cca2 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 23:37:33 +0300
Subject: [PATCH 3/6] Set MSVSphere installer colors
Subject: [PATCH 3/7] Set MSVSphere installer colors
---
data/anaconda-gtk.css | 3 ++-

@ -1,7 +1,7 @@
From 50fb07a64192d2d84a1a58d1722a1f6263928cf1 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 23:41:01 +0300
Subject: [PATCH 4/6] Add Minimal repository support
Subject: [PATCH 4/7] Add Minimal repository support
---
pyanaconda/core/constants.py | 3 ++-

@ -1,7 +1,7 @@
From f28728f85b810f291666ef6334b4c3dbf1347ef2 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Thu, 30 Mar 2023 00:09:57 +0300
Subject: [PATCH 5/6] Change Fedora references to MSVSphere
Subject: [PATCH 5/7] Change Fedora references to MSVSphere
---
data/liveinst/gnome/fedora-welcome.desktop | 2 +-

@ -1,19 +1,19 @@
From 9f7e42b75011fa4cdbce78ca4fbeb70d3357fea6 Mon Sep 17 00:00:00 2001
From 10a65585496da65de7168bb1d42e61020e832f1d Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Thu, 30 Mar 2023 00:11:34 +0300
Subject: [PATCH 6/6] Add MSVSphere product config
Subject: [PATCH 6/7] Add MSVSphere product config
---
data/product.d/msvsphere.conf | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
data/product.d/msvsphere.conf | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
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..d1d177b
index 0000000..dc534c9
--- /dev/null
+++ b/data/product.d/msvsphere.conf
@@ -0,0 +1,30 @@
@@ -0,0 +1,29 @@
+# Anaconda configuration file for MSVSphere.
+
+[Product]
@ -29,7 +29,6 @@ index 0000000..d1d177b
+ 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

@ -0,0 +1,55 @@
From 60164bb113584e4cfd8a419735205398caa6b81d Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Mon, 3 Apr 2023 21:38:38 +0300
Subject: [PATCH 7/7] Set default timezone to Europe/Moscow
---
pyanaconda/modules/timezone/installation.py | 4 ++--
pyanaconda/modules/timezone/timezone.py | 2 +-
pyanaconda/ui/gui/spokes/datetime_spoke.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/modules/timezone/installation.py b/pyanaconda/modules/timezone/installation.py
index d6dfd7b..984646d 100644
--- a/pyanaconda/modules/timezone/installation.py
+++ b/pyanaconda/modules/timezone/installation.py
@@ -63,8 +63,8 @@ class ConfigureTimezoneTask(Task):
if not is_valid_timezone(self._timezone):
# this should never happen, but for pity's sake
log.warning("Timezone %s set in kickstart is not valid, "
- "falling back to default (America/New_York).", self._timezone)
- self._timezone = "America/New_York"
+ "falling back to default (Europe/Moscow).", self._timezone)
+ self._timezone = "Europe/Moscow"
def _make_timezone_symlink(self):
"""Create the symlink that actually defines timezone."""
diff --git a/pyanaconda/modules/timezone/timezone.py b/pyanaconda/modules/timezone/timezone.py
index b5d5f7b..1651e04 100644
--- a/pyanaconda/modules/timezone/timezone.py
+++ b/pyanaconda/modules/timezone/timezone.py
@@ -44,7 +44,7 @@ class TimezoneService(KickstartService):
def __init__(self):
super().__init__()
self.timezone_changed = Signal()
- self._timezone = "America/New_York"
+ self._timezone = "Europe/Moscow"
self.is_utc_changed = Signal()
self._is_utc = False
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index 1129036..3b253f7 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -69,7 +69,7 @@ SERVER_WORKING = 3
SERVER_USE = 4
SERVER_OBJECT = 5
-DEFAULT_TZ = "America/New_York"
+DEFAULT_TZ = "Europe/Moscow"
SPLIT_NUMBER_SUFFIX_RE = re.compile(r'([^0-9]*)([-+])([0-9]+)')
--
2.39.2

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 34.25.1.14
Release: 1%{?dist}.inferit
Release: 1%{?dist}.inferit.1
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -19,6 +19,7 @@ Patch1003: 0003-Set-MSVSphere-installer-colors.patch
Patch1004: 0004-Add-Minimal-repository-support.patch
Patch1005: 0005-Change-Fedora-references-to-MSVSphere.patch
Patch1006: 0006-Add-MSVSphere-product-config.patch
Patch1007: 0007-Set-default-timezone-to-Europe-Moscow.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -419,6 +420,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Mon Apr 03 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.1
- Set default time zone to Europe/Moscow
- Disabled Security module until we have OpenScap workable
* Thu Mar 30 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit
- Added MSVSphere product config
- Added Minimal repository support

Loading…
Cancel
Save