- Hide CDN source button - Set MSVSphere installer colors - Add Minimal and Server repository support - Set default timezone to Europe Moscow - Add MSVSphere product config - Set Russian language as default - Set Russian as default language for new regions - Added new products - Debranding from RHEL - Update Russian translation - Fix smt url - Enable administrator by defaulti8
parent
1ca7467a20
commit
d7b420af05
GPG Key ID:
1EC08A25C9DB2503
@ -0,0 +1,27 @@
|
|||||||
|
From f90eb8643e209084d0b1c4aa93abf50cf2f94027 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 11:24:22 +0300
|
||||||
|
Subject: [PATCH 01/11] Disable subscription
|
||||||
|
|
||||||
|
---
|
||||||
|
pyanaconda/ui/gui/spokes/subscription.py | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/pyanaconda/ui/gui/spokes/subscription.py b/pyanaconda/ui/gui/spokes/subscription.py
|
||||||
|
index f4ee772..27d6b42 100644
|
||||||
|
--- a/pyanaconda/ui/gui/spokes/subscription.py
|
||||||
|
+++ b/pyanaconda/ui/gui/spokes/subscription.py
|
||||||
|
@@ -547,6 +547,10 @@ class SubscriptionSpoke(NormalSpoke):
|
||||||
|
# also set the spoke warning banner
|
||||||
|
self.show_warning_message(error_message)
|
||||||
|
|
||||||
|
+ @property
|
||||||
|
+ def showable(self):
|
||||||
|
+ return False
|
||||||
|
+
|
||||||
|
def initialize(self):
|
||||||
|
NormalSpoke.initialize(self)
|
||||||
|
self.initialize_start()
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
From 8f5b7be529a05d44ec9f3733f8ce9b9ac4dd8217 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 11:25:09 +0300
|
||||||
|
Subject: [PATCH 02/11] Hide CDN source button
|
||||||
|
|
||||||
|
---
|
||||||
|
pyanaconda/ui/gui/spokes/installation_source.py | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py
|
||||||
|
index d0d4da7..4d1c659 100644
|
||||||
|
--- a/pyanaconda/ui/gui/spokes/installation_source.py
|
||||||
|
+++ b/pyanaconda/ui/gui/spokes/installation_source.py
|
||||||
|
@@ -704,6 +704,8 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler):
|
||||||
|
self._network_button = self.builder.get_object("networkRadioButton")
|
||||||
|
self._network_box = self.builder.get_object("networkBox")
|
||||||
|
|
||||||
|
+ really_hide(self._cdn_button)
|
||||||
|
+
|
||||||
|
self._url_entry = self.builder.get_object("urlEntry")
|
||||||
|
self._protocol_combo_box = self.builder.get_object("protocolComboBox")
|
||||||
|
self._iso_chooser_button = self.builder.get_object("isoChooserButton")
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
From 2909f6d5166943f0acb18e8b65f02c1c66eb8c81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 11:26:08 +0300
|
||||||
|
Subject: [PATCH 03/11] Set MSVSphere installer colors
|
||||||
|
|
||||||
|
---
|
||||||
|
data/anaconda-gtk.css | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css
|
||||||
|
index 60a670e..cc1ec4b 100644
|
||||||
|
--- a/data/anaconda-gtk.css
|
||||||
|
+++ b/data/anaconda-gtk.css
|
||||||
|
@@ -92,10 +92,12 @@ infobar.error {
|
||||||
|
|
||||||
|
@define-color redhat #2d2d2d;
|
||||||
|
@define-color fedora #2f4265;
|
||||||
|
+@define-color msvsphere #343434;
|
||||||
|
|
||||||
|
/* theme colors/images */
|
||||||
|
|
||||||
|
@define-color product_bg_color @redhat;
|
||||||
|
+@define-color product_bg_color @msvsphere;
|
||||||
|
|
||||||
|
/* logo and sidebar classes */
|
||||||
|
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
From cc4c5543889a79108e072d23676895b072009363 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 11:28:41 +0300
|
||||||
|
Subject: [PATCH 04/11] Add Minimal and Server repository support
|
||||||
|
|
||||||
|
---
|
||||||
|
pyanaconda/core/constants.py | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
|
||||||
|
index 0ab2627..bcc5270 100644
|
||||||
|
--- a/pyanaconda/core/constants.py
|
||||||
|
+++ b/pyanaconda/core/constants.py
|
||||||
|
@@ -61,7 +61,9 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(),
|
||||||
|
"fedora-modular-server",
|
||||||
|
"rawhide",
|
||||||
|
"BaseOS", # Used by RHEL
|
||||||
|
- "baseos"] # Used by CentOS Stream
|
||||||
|
+ "baseos", # Used by CentOS Stream
|
||||||
|
+ "Server", # Used by MSVSphere
|
||||||
|
+ "Minimal"] # Used by MSVSphere
|
||||||
|
|
||||||
|
# Get list of repo names which should be used as updates repos
|
||||||
|
DEFAULT_UPDATE_REPOS = ["updates",
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
From 7d3a07429738cd60e2d1793ddb197453797b5d92 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 11:34:46 +0300
|
||||||
|
Subject: [PATCH 05/11] 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 829748c..83c5927 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 b0fedc4..9782ee7 100644
|
||||||
|
--- a/pyanaconda/modules/timezone/timezone.py
|
||||||
|
+++ b/pyanaconda/modules/timezone/timezone.py
|
||||||
|
@@ -39,7 +39,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 50ae156..b50f75b 100644
|
||||||
|
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
|
||||||
|
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
|
||||||
|
@@ -66,7 +66,7 @@ SERVER_POOL = 1
|
||||||
|
SERVER_WORKING = 2
|
||||||
|
SERVER_USE = 3
|
||||||
|
|
||||||
|
-DEFAULT_TZ = "America/New_York"
|
||||||
|
+DEFAULT_TZ = "Europe/Moscow"
|
||||||
|
|
||||||
|
SPLIT_NUMBER_SUFFIX_RE = re.compile(r'([^0-9]*)([-+])([0-9]+)')
|
||||||
|
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
From a875968192c09e4d132f3e2a97977f975ca8ae11 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 12:00:36 +0300
|
||||||
|
Subject: [PATCH 06/11] Add MSVSphere product config
|
||||||
|
|
||||||
|
---
|
||||||
|
data/product.d/msvsphere.conf | 21 +++++++++++++++++++++
|
||||||
|
1 file changed, 21 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..baaf497
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/data/product.d/msvsphere.conf
|
||||||
|
@@ -0,0 +1,21 @@
|
||||||
|
+# Anaconda configuration file for MSVSphere.
|
||||||
|
+
|
||||||
|
+[Product]
|
||||||
|
+product_name = MSVSphere
|
||||||
|
+
|
||||||
|
+[Base Product]
|
||||||
|
+product_name = Red Hat Enterprise Linux
|
||||||
|
+
|
||||||
|
+[Anaconda]
|
||||||
|
+forbidden_modules =
|
||||||
|
+ org.fedoraproject.Anaconda.Modules.Subscription
|
||||||
|
+
|
||||||
|
+[Bootloader]
|
||||||
|
+efi_dir = msvsphere
|
||||||
|
+
|
||||||
|
+[Payload]
|
||||||
|
+enable_closest_mirror = True
|
||||||
|
+default_source = CLOSEST_MIRROR
|
||||||
|
+
|
||||||
|
+[License]
|
||||||
|
+eula = /usr/share/sphere-release/EULA
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
From a4ca8ae2cf31bfa3e7a553bc9c65ac783f8e4002 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 12:01:29 +0300
|
||||||
|
Subject: [PATCH 07/11] Set Russian language as default
|
||||||
|
|
||||||
|
---
|
||||||
|
pyanaconda/core/constants.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
|
||||||
|
index bcc5270..1745ce2 100644
|
||||||
|
--- a/pyanaconda/core/constants.py
|
||||||
|
+++ b/pyanaconda/core/constants.py
|
||||||
|
@@ -79,7 +79,7 @@ ANACONDA_CONFIG_DIR = "/etc/anaconda/"
|
||||||
|
ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf"
|
||||||
|
|
||||||
|
# NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8
|
||||||
|
-DEFAULT_LANG = "en_US.UTF-8"
|
||||||
|
+DEFAULT_LANG = "ru_RU.UTF-8"
|
||||||
|
|
||||||
|
DEFAULT_VC_FONT = "eurlatgr"
|
||||||
|
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
@ -0,0 +1,34 @@
|
|||||||
|
From ff1ffae621a47d4e04744d1088168bbb1c29bd0d Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 12:03:49 +0300
|
||||||
|
Subject: [PATCH 08/11] Set Russian as default language for new regions
|
||||||
|
|
||||||
|
---
|
||||||
|
pyanaconda/geoloc.py | 11 +++++++++++
|
||||||
|
1 file changed, 11 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/pyanaconda/geoloc.py b/pyanaconda/geoloc.py
|
||||||
|
index 4873ea0..a9aa117 100644
|
||||||
|
--- a/pyanaconda/geoloc.py
|
||||||
|
+++ b/pyanaconda/geoloc.py
|
||||||
|
@@ -483,6 +483,17 @@ class FedoraGeoIPProvider(GeolocationBackend):
|
||||||
|
timezone_source = "GeoIP"
|
||||||
|
timezone_code = json_reply.get("time_zone", None)
|
||||||
|
|
||||||
|
+ # set Russian as default language for new regions
|
||||||
|
+ if territory == "UA":
|
||||||
|
+ region = json_reply.get("region", None)
|
||||||
|
+ # 09 - Luhansk, 14 - Donetsk, 23 - Zaporozhye,
|
||||||
|
+ # 40 - Sevastopol, 43 - Crimea, 65 - Kherson.
|
||||||
|
+ # See ISO 3166-2:UA
|
||||||
|
+ new_region_codes = ("09", "14", "23", "40", "43", "65")
|
||||||
|
+ if region in new_region_codes:
|
||||||
|
+ territory = "RU"
|
||||||
|
+ timezone_code = "Europe/Moscow"
|
||||||
|
+
|
||||||
|
# check if the timezone returned by the API is valid
|
||||||
|
if not is_valid_timezone(timezone_code):
|
||||||
|
# try to get a timezone from the territory code
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,42 @@
|
|||||||
|
From 6ca2b4ca1aa775d3c4a76a538da68a5aea5c8727 Mon Sep 17 00:00:00 2001
|
||||||
|
From: tigro <tigro@msvsphere-os.ru>
|
||||||
|
Date: Tue, 19 Dec 2023 13:53:57 +0300
|
||||||
|
Subject: [PATCH 11/11] Enable administrator by default
|
||||||
|
|
||||||
|
---
|
||||||
|
pyanaconda/ui/gui/spokes/user.glade | 3 ++-
|
||||||
|
pyanaconda/ui/lib/users.py | 4 +++-
|
||||||
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pyanaconda/ui/gui/spokes/user.glade b/pyanaconda/ui/gui/spokes/user.glade
|
||||||
|
index 69156b1..3409166 100644
|
||||||
|
--- a/pyanaconda/ui/gui/spokes/user.glade
|
||||||
|
+++ b/pyanaconda/ui/gui/spokes/user.glade
|
||||||
|
@@ -263,7 +263,8 @@
|
||||||
|
<property name="visible">True</property>
|
||||||
|
<property name="can_focus">True</property>
|
||||||
|
<property name="receives_default">False</property>
|
||||||
|
- <property name="use_underline">True</property>
|
||||||
|
+ <property name="use_underline">True</property>
|
||||||
|
+ <property name="active">True</property>
|
||||||
|
<property name="xalign">0</property>
|
||||||
|
<property name="draw_indicator">True</property>
|
||||||
|
<signal name="toggled" handler="on_admin_toggled" swapped="no"/>
|
||||||
|
diff --git a/pyanaconda/ui/lib/users.py b/pyanaconda/ui/lib/users.py
|
||||||
|
index 31665f0..415a914 100644
|
||||||
|
--- a/pyanaconda/ui/lib/users.py
|
||||||
|
+++ b/pyanaconda/ui/lib/users.py
|
||||||
|
@@ -40,7 +40,9 @@ def get_user_list(users_module, add_default=False, add_if_not_empty=False):
|
||||||
|
# we only add default user to an empty list, to add default user to
|
||||||
|
# a populated list the add_if_not_empty option needs to be used
|
||||||
|
if not user_data_list or add_if_not_empty:
|
||||||
|
- user_data_list.insert(0, UserData())
|
||||||
|
+ data = UserData()
|
||||||
|
+ data.set_admin_priviledges(True)
|
||||||
|
+ user_data_list.insert(0, data)
|
||||||
|
|
||||||
|
return user_data_list
|
||||||
|
|
||||||
|
--
|
||||||
|
2.43.0
|
||||||
|
|
||||||
Loading…
Reference in new issue