Compare commits

..

No commits in common. 'i10-beta' and 'i9' have entirely different histories.
i10-beta ... i9

@ -1 +1 @@
737e60e285c648e553fbe6cdf23b42f253752d4a SOURCES/anaconda-40.22.3.19.tar.bz2 71620d2ed3ce54558da0cb8d49cac48fa89d3a7a SOURCES/anaconda-34.25.4.9.tar.bz2

2
.gitignore vendored

@ -1 +1 @@
SOURCES/anaconda-40.22.3.19.tar.bz2 SOURCES/anaconda-34.25.4.9.tar.bz2

@ -1,4 +1,4 @@
From 9c5bf55836e7f308d6ec86d97eb0668c1db91892 Mon Sep 17 00:00:00 2001 From 8454ae65d1f7cb2f0221a33fd223c2b460c27017 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info> From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 12:53:14 +0300 Date: Fri, 14 Apr 2023 12:53:14 +0300
Subject: [PATCH 01/15] Disable subscription Subject: [PATCH 01/15] Disable subscription
@ -8,10 +8,10 @@ Subject: [PATCH 01/15] Disable subscription
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/subscription.py b/pyanaconda/ui/gui/spokes/subscription.py diff --git a/pyanaconda/ui/gui/spokes/subscription.py b/pyanaconda/ui/gui/spokes/subscription.py
index e8cf442..5c5db81 100644 index 4d03689..3b0e6c0 100644
--- a/pyanaconda/ui/gui/spokes/subscription.py --- a/pyanaconda/ui/gui/spokes/subscription.py
+++ b/pyanaconda/ui/gui/spokes/subscription.py +++ b/pyanaconda/ui/gui/spokes/subscription.py
@@ -540,6 +540,10 @@ class SubscriptionSpoke(NormalSpoke): @@ -551,6 +551,10 @@ class SubscriptionSpoke(NormalSpoke):
# also set the spoke warning banner # also set the spoke warning banner
self.show_warning_message(error_message) self.show_warning_message(error_message)
@ -23,5 +23,5 @@ index e8cf442..5c5db81 100644
NormalSpoke.initialize(self) NormalSpoke.initialize(self)
self.initialize_start() self.initialize_start()
-- --
2.43.5 2.44.0

@ -1,4 +1,4 @@
From 1b180235392825e31536fe58381c4183228309b6 Mon Sep 17 00:00:00 2001 From 3e3d00cc21ab256eb55c5e5176f66cd7a348c111 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info> From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 12:54:58 +0300 Date: Fri, 14 Apr 2023 12:54:58 +0300
Subject: [PATCH 02/15] Hide CDN source button Subject: [PATCH 02/15] Hide CDN source button
@ -8,10 +8,10 @@ Subject: [PATCH 02/15] Hide CDN source button
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py
index 0c98e17..6fa4475 100644 index c467bd3..398ac11 100644
--- a/pyanaconda/ui/gui/spokes/installation_source.py --- a/pyanaconda/ui/gui/spokes/installation_source.py
+++ b/pyanaconda/ui/gui/spokes/installation_source.py +++ b/pyanaconda/ui/gui/spokes/installation_source.py
@@ -353,6 +353,8 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler): @@ -798,6 +798,8 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler):
self._network_button = self.builder.get_object("networkRadioButton") self._network_button = self.builder.get_object("networkRadioButton")
self._network_box = self.builder.get_object("networkBox") self._network_box = self.builder.get_object("networkBox")
@ -21,5 +21,5 @@ index 0c98e17..6fa4475 100644
self._protocol_combo_box = self.builder.get_object("protocolComboBox") self._protocol_combo_box = self.builder.get_object("protocolComboBox")
self._iso_chooser_button = self.builder.get_object("isoChooserButton") self._iso_chooser_button = self.builder.get_object("isoChooserButton")
-- --
2.43.5 2.44.0

@ -1,37 +1,29 @@
From d9fe80cb2d797a077d604d8f9a69ceaf5167e51b Mon Sep 17 00:00:00 2001 From d78fb7d96c772f00ce4b35f4f9209b2d629c27e0 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com> From: Eugene Zamriy <eugene@zamriy.info>
Date: Thu, 19 Dec 2024 21:13:04 +0300 Date: Fri, 14 Apr 2023 12:56:19 +0300
Subject: [PATCH 03/15] Set MSVSphere installer colors Subject: [PATCH 03/15] Set MSVSphere installer colors
--- ---
data/anaconda-gtk.css | 5 +++-- data/anaconda-gtk.css | 3 ++-
1 file changed, 3 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css
index f83cf15..ef557ee 100644 index 516df62..ef6d79d 100644
--- a/data/anaconda-gtk.css --- a/data/anaconda-gtk.css
+++ b/data/anaconda-gtk.css +++ b/data/anaconda-gtk.css
@@ -96,9 +96,10 @@ infobar.error box { @@ -92,10 +92,11 @@ infobar.error box {
*/
@define-color anaconda_bg_color #2f4265; @define-color redhat #2d2d2d;
@define-color fedora #2f4265;
+@define-color msvsphere #343434; +@define-color msvsphere #343434;
.logo-sidebar { /* theme colors/images */
- background-color: @anaconda_bg_color;
+ background-color: @msvsphere;
}
/* This is a placeholder to be filled by a product-specific logo. */ -@define-color product_bg_color @fedora;
@@ -114,7 +115,7 @@ infobar.error box { +@define-color product_bg_color @msvsphere;
}
AnacondaSpokeWindow #nav-box { /* logo and sidebar classes */
- background-color: @anaconda_bg_color;
+ background-color: @msvsphere;
color: white;
}
-- --
2.43.5 2.44.0

@ -1,26 +1,27 @@
From 390568b415c06b3c129bbb122f5eb103e88e4080 Mon Sep 17 00:00:00 2001 From 18fcf71d53a8c476c55076f8a0e8db0904a51670 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: Eugene Zamriy <evgeniy.zamriy@softline.com>
Date: Thu, 19 Dec 2024 21:19:04 +0300 Date: Fri, 28 Jul 2023 23:47:23 +0300
Subject: [PATCH 04/15] Add Minimal and Server repository support Subject: [PATCH 04/15] Add Minimal and Server repository support
--- ---
pyanaconda/core/constants.py | 3 +++ pyanaconda/core/constants.py | 4 +++-
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 5232e6d..3d0b56d 100644 index 1496f8c..72a9d39 100644
--- a/pyanaconda/core/constants.py --- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py
@@ -58,6 +58,9 @@ DEFAULT_REPOS = [ @@ -58,7 +58,9 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(),
"fedora-modular-server",
"rawhide",
"BaseOS", # Used by RHEL "BaseOS", # Used by RHEL
"baseos", # Used by CentOS Stream - "baseos"] # Used by CentOS Stream
"eln-baseos", # Used by Fedora ELN + "baseos", # Used by CentOS Stream
+ "Server", # Used by MSVSphere + "Server", # Used by MSVSphere
+ "Certified", # Used by MSVSphere Certified + "Minimal"] # Used by MSVSphere
+ "Minimal", # Used by MSVSphere
]
DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS" DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS"
-- --
2.43.5 2.44.0

@ -1,6 +1,6 @@
From 028412d2e031a850831d0a521af49051299e1b10 Mon Sep 17 00:00:00 2001 From 590d0e07d420aa32e69d23e1d70211ceaf35aa1f Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Thu, 19 Dec 2024 21:24:09 +0300 Date: Wed, 3 Apr 2024 09:41:32 +0300
Subject: [PATCH 05/15] Set default timezone to Europe/Moscow Subject: [PATCH 05/15] Set default timezone to Europe/Moscow
--- ---
@ -10,11 +10,11 @@ Subject: [PATCH 05/15] Set default timezone to Europe/Moscow
3 files changed, 4 insertions(+), 4 deletions(-) 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/modules/timezone/installation.py b/pyanaconda/modules/timezone/installation.py diff --git a/pyanaconda/modules/timezone/installation.py b/pyanaconda/modules/timezone/installation.py
index 0cd7510..024a881 100644 index fcd04d1..88ac7b5 100644
--- a/pyanaconda/modules/timezone/installation.py --- a/pyanaconda/modules/timezone/installation.py
+++ b/pyanaconda/modules/timezone/installation.py +++ b/pyanaconda/modules/timezone/installation.py
@@ -96,8 +96,8 @@ class ConfigureTimezoneTask(Task): @@ -67,8 +67,8 @@ class ConfigureTimezoneTask(Task):
if not is_valid_timezone(self._timezone): else:
# this should never happen, but for pity's sake # this should never happen, but for pity's sake
log.warning("Timezone %s set in kickstart is not valid, " log.warning("Timezone %s set in kickstart is not valid, "
- "falling back to default (America/New_York).", self._timezone) - "falling back to default (America/New_York).", self._timezone)
@ -25,10 +25,10 @@ index 0cd7510..024a881 100644
def _make_timezone_symlink(self): def _make_timezone_symlink(self):
"""Create the symlink that actually defines timezone.""" """Create the symlink that actually defines timezone."""
diff --git a/pyanaconda/modules/timezone/timezone.py b/pyanaconda/modules/timezone/timezone.py diff --git a/pyanaconda/modules/timezone/timezone.py b/pyanaconda/modules/timezone/timezone.py
index 1640d9f..40fe8ea 100644 index ac5318c..42e0cfe 100644
--- a/pyanaconda/modules/timezone/timezone.py --- a/pyanaconda/modules/timezone/timezone.py
+++ b/pyanaconda/modules/timezone/timezone.py +++ b/pyanaconda/modules/timezone/timezone.py
@@ -51,7 +51,7 @@ class TimezoneService(KickstartService): @@ -46,7 +46,7 @@ class TimezoneService(KickstartService):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.timezone_changed = Signal() self.timezone_changed = Signal()
@ -38,12 +38,12 @@ index 1640d9f..40fe8ea 100644
self.geolocation_result_changed = Signal() self.geolocation_result_changed = Signal()
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index c379b39..dea5af7 100644 index 117dfe3..f35bab1 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -57,7 +57,7 @@ log = get_module_logger(__name__) @@ -70,7 +70,7 @@ SERVER_WORKING = 3
SERVER_USE = 4
__all__ = ["DatetimeSpoke"] SERVER_OBJECT = 5
-DEFAULT_TZ = "America/New_York" -DEFAULT_TZ = "America/New_York"
+DEFAULT_TZ = "Europe/Moscow" +DEFAULT_TZ = "Europe/Moscow"
@ -51,5 +51,5 @@ index c379b39..dea5af7 100644
SPLIT_NUMBER_SUFFIX_RE = re.compile(r'([^0-9]*)([-+])([0-9]+)') SPLIT_NUMBER_SUFFIX_RE = re.compile(r'([^0-9]*)([-+])([0-9]+)')
-- --
2.43.5 2.44.0

@ -1,55 +1,26 @@
From 9fb4b8b7e4e6a995da947d93718eb945b8f1bc30 Mon Sep 17 00:00:00 2001 From 0fc5e241d84cb01bbaf93bba4e400d2f06b372c9 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Tue, 24 Dec 2024 14:45:34 +0300 Date: Fri, 14 Apr 2023 14:59:53 +0300
Subject: [PATCH] Add MSVSphere product config Subject: [PATCH 06/15] Add MSVSphere product config
--- ---
data/profile.d/Makefile.am | 1 + data/product.d/msvsphere.conf | 21 +++++++++++++++++++++
data/profile.d/Makefile.in | 1 + 1 file changed, 21 insertions(+)
data/profile.d/msvsphere.conf | 24 ++++++++++++++++++++++++ create mode 100644 data/product.d/msvsphere.conf
3 files changed, 26 insertions(+)
create mode 100644 data/profile.d/msvsphere.conf
diff --git a/data/profile.d/Makefile.am b/data/profile.d/Makefile.am diff --git a/data/product.d/msvsphere.conf b/data/product.d/msvsphere.conf
index 2f1dbd9..643a236 100644
--- a/data/profile.d/Makefile.am
+++ b/data/profile.d/Makefile.am
@@ -30,6 +30,7 @@ dist_config_DATA = \
fedora-silverblue.conf \
fedora-workstation.conf \
fedora.conf \
+ msvsphere.conf \
ovirt.conf \
rhel.conf \
rhvh.conf \
diff --git a/data/profile.d/Makefile.in b/data/profile.d/Makefile.in
index d9911fd..e891c84 100644
--- a/data/profile.d/Makefile.in
+++ b/data/profile.d/Makefile.in
@@ -328,6 +328,7 @@ dist_config_DATA = \
fedora-silverblue.conf \
fedora-workstation.conf \
fedora.conf \
+ msvsphere.conf \
ovirt.conf \
rhel.conf \
rhvh.conf \
diff --git a/data/profile.d/msvsphere.conf b/data/profile.d/msvsphere.conf
new file mode 100644 new file mode 100644
index 0000000..6f4ac7e index 0000000..baaf497
--- /dev/null --- /dev/null
+++ b/data/profile.d/msvsphere.conf +++ b/data/product.d/msvsphere.conf
@@ -0,0 +1,24 @@ @@ -0,0 +1,21 @@
+# Anaconda configuration file for MSVSphere. +# Anaconda configuration file for MSVSphere.
+ +
+[Profile] +[Product]
+# Define the profile. +product_name = MSVSphere
+profile_id = msvsphere
+base_profile = rhel
+ +
+[Profile Detection] +[Base Product]
+# Match os-release values. +product_name = Red Hat Enterprise Linux
+os_id = msvsphere
+ +
+[Anaconda] +[Anaconda]
+forbidden_modules = +forbidden_modules =
@ -63,7 +34,7 @@ index 0000000..6f4ac7e
+default_source = CLOSEST_MIRROR +default_source = CLOSEST_MIRROR
+ +
+[License] +[License]
+eula = /usr/share/msvsphere-release/EULA +eula = /usr/share/sphere-release/EULA
-- --
2.47.1 2.44.0

@ -1,6 +1,6 @@
From 5b6dfb604760f76121e6152ed387c4f939ded693 Mon Sep 17 00:00:00 2001 From bb93c14285802d057447369c44b662d2d43521a8 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Thu, 19 Dec 2024 21:25:45 +0300 Date: Fri, 14 Apr 2023 18:00:57 +0300
Subject: [PATCH 07/15] Set Russian language as default Subject: [PATCH 07/15] Set Russian language as default
--- ---
@ -8,11 +8,11 @@ Subject: [PATCH 07/15] Set Russian language as default
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 3d0b56d..e2f5d1a 100644 index 72a9d39..ca9dadc 100644
--- a/pyanaconda/core/constants.py --- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py
@@ -78,7 +78,7 @@ WEBUI_VIEWER_PID_FILE = "/run/anaconda/webui_script.pid" @@ -72,7 +72,7 @@ ANACONDA_CONFIG_DIR = "/etc/anaconda/"
BACKEND_READY_FLAG_FILE = "/run/anaconda/backend_ready" ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf"
# NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8 # NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8
-DEFAULT_LANG = "en_US.UTF-8" -DEFAULT_LANG = "en_US.UTF-8"
@ -21,5 +21,5 @@ index 3d0b56d..e2f5d1a 100644
DEFAULT_VC_FONT = "eurlatgr" DEFAULT_VC_FONT = "eurlatgr"
-- --
2.43.5 2.44.0

@ -1,60 +1,61 @@
From f57f53c0189b96a426ab033b19a8a808d3e1b269 Mon Sep 17 00:00:00 2001 From 03809bf006ee92d63a3bc4bc9702ceca757a5e9c Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Thu, 19 Dec 2024 21:34:38 +0300 Date: Fri, 14 Apr 2023 18:23:29 +0300
Subject: [PATCH 08/15] Replace Fedora references and update translations Subject: [PATCH 08/15] Replace Fedora references and update translations
--- ---
data/liveinst/gnome/fedora-welcome.desktop | 3 ++-
data/liveinst/gnome/fedora-welcome.js | 6 +++--- data/liveinst/gnome/fedora-welcome.js | 6 +++---
.../gnome/org.fedoraproject.welcome-screen.desktop | 3 ++-
docs/intro.rst | 4 ++-- docs/intro.rst | 4 ++--
docs/iscsi.rst | 8 ++++---- docs/iscsi.rst | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-) pyanaconda/core/constants.py | 4 ++--
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
index fc42e5d..61e11ff 100755 index 60e5c38..90f5678 100644
--- a/data/liveinst/gnome/fedora-welcome.js --- a/data/liveinst/gnome/fedora-welcome.desktop
+++ b/data/liveinst/gnome/fedora-welcome.js +++ b/data/liveinst/gnome/fedora-welcome.desktop
@@ -46,7 +46,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
}
constructor(application) {
- const title = _('Welcome to Fedora!');
+ const title = _('Welcome to MSVSphere!');
super({
application,
title,
@@ -58,7 +58,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
const statusPage = new Adw.StatusPage({
title,
iconName: 'fedora-logo-icon',
- description: _('This live media can be used to install Fedora or as a temporary system. Installation can be started at any time using the install icon in Activities.'),
+ description: _('This live media can be used to install MSVSphere or as a temporary system. Installation can be started at any time using the install icon in Activities.'),
});
this.content.set_child(statusPage);
@@ -71,7 +71,7 @@ class WelcomeWindow extends Adw.ApplicationWindow {
statusPage.set_child(buttonBox);
const installButton = new Gtk.Button({
- label: _('Install Fedora…'),
+ label: _('Install MSVSphere…'),
actionName: 'window.install-fedora',
});
installButton.add_css_class('pill');
diff --git a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
index c3551b1..60ab503 100644
--- a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
+++ b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
-Name=Welcome to Fedora -Name=Welcome to Fedora
+Name=Welcome to MSVSphere +Name=Welcome to MSVSphere
+Name[ru]=Добро пожаловать в МСВСфера +Name[ru]=Добро пожаловать в МСВСфера
Icon=fedora-logo-icon
Exec=/usr/share/anaconda/gnome/fedora-welcome Exec=/usr/share/anaconda/gnome/fedora-welcome
Terminal=false Terminal=false
Type=Application
diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js
index 0520557..4c0a66a 100755
--- a/data/liveinst/gnome/fedora-welcome.js
+++ b/data/liveinst/gnome/fedora-welcome.js
@@ -62,7 +62,7 @@ const WelcomeWindow = new Lang.Class({
default_width: 600,
default_height: 550,
skip_taskbar_hint: true,
- title: _("Welcome to Fedora"),
+ title: _("Welcome to MSVSphere"),
window_position: Gtk.WindowPosition.CENTER });
this.window.connect('key-press-event', Lang.bind(this,
function(w, event) {
@@ -91,7 +91,7 @@ const WelcomeWindow = new Lang.Class({
spacing: 16 });
tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
pixel_size: 256 }));
- tryContent.add(makeLabel(_("Try Fedora"), true));
+ tryContent.add(makeLabel(_("Try MSVSphere"), true));
let tryButton = new Gtk.Button({ child: tryContent });
buttonBox.add(tryButton);
@@ -107,7 +107,7 @@ const WelcomeWindow = new Lang.Class({
let installButton = new Gtk.Button({ child: installContent });
buttonBox.add(installButton);
- this._label = makeLabel(_("You are currently running Fedora from live media.\nYou can install Fedora now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
+ this._label = makeLabel(_("You are currently running MSVSphere from live media.\nYou can install MSVSphere now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false);
mainGrid.add(this._label);
installButton.connect('clicked', Lang.bind(this,
diff --git a/docs/intro.rst b/docs/intro.rst diff --git a/docs/intro.rst b/docs/intro.rst
index 3c62e77..d4b7f53 100644 index bbaf74f..65a1a35 100644
--- a/docs/intro.rst --- a/docs/intro.rst
+++ b/docs/intro.rst +++ b/docs/intro.rst
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
@ -69,29 +70,9 @@ index 3c62e77..d4b7f53 100644
During installation, a target computer's hardware is identified and configured During installation, a target computer's hardware is identified and configured
and the appropriate file systems for the system's architecture are created. and the appropriate file systems for the system's architecture are created.
diff --git a/docs/iscsi.rst b/docs/iscsi.rst diff --git a/docs/iscsi.rst b/docs/iscsi.rst
index 847078d..1f1d377 100644 index 847078d..6d9c4b3 100644
--- a/docs/iscsi.rst --- a/docs/iscsi.rst
+++ b/docs/iscsi.rst +++ b/docs/iscsi.rst
@@ -16,8 +16,8 @@ The terminology:
- 'initiator', the client in the iscsi connection. The computer we are running
Anaconda on is typically an initiator.
- 'target', the storage device behind the Network. This is where the data is
- physically stored and read from. You can turn any Fedora/RHEL machine to a
- target (or several) via scsi-target-utils.
+ physically stored and read from. You can turn any Fedora/RHEL/MSVSphere machine
+ to a target (or several) via scsi-target-utils.
- 'HBA' or Host Bus Adapter. A device (PCI card typically) you connect to a
computer. It acts as a NIC and if you configure it properly it transparently
connects to the target when started and all you can see is a block device on
@@ -25,7 +25,7 @@ The terminology:
- 'software initiator' is what you end up with if you emulate most of what HBA is
doing and just use a regular NIC for the iscsi communication. The modern Linux
kernel has a software initiator. To use it, you need the Open-ISCSI software
- stack [1, 2] installed. It is known as iscsi-initiator-utils in Fedora/RHEL.
+ stack [1, 2] installed. It is known as iscsi-initiator-utils in Fedora/RHEL/MSVSphere.
- 'partial offload card'. Similar to HBA but needs some support from kernel and
iscsi-initiator-utils. The least pleasant to work with, particularly because
there is no standardized amount of the manual setting that needs to be done
@@ -139,7 +139,7 @@ If for some reason the DeviceTree fails at recognizing iscsi devices as such, @@ -139,7 +139,7 @@ If for some reason the DeviceTree fails at recognizing iscsi devices as such,
The booting problems are either due to incorrectly generated dracut boot The booting problems are either due to incorrectly generated dracut boot
arguments or they are simply dracut bugs. arguments or they are simply dracut bugs.
@ -101,6 +82,21 @@ index 847078d..1f1d377 100644
and so the issues can often be reproduced and debugged. and so the issues can often be reproduced and debugged.
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index ca9dadc..84b03e3 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -156,8 +156,8 @@ WARNING_SUPPORT_REMOVED = N_(
)
WARNING_HARDWARE_UNSUPPORTED = N_(
- "This hardware (or a combination thereof) is not supported by Red Hat. For more information "
- "on supported hardware, please refer to http://www.redhat.com/hardware."
+ "This hardware (or a combination thereof) is not supported by MSVSphere. For more information "
+ "on supported hardware, please refer to https://msvsphere-os.ru."
)
# Storage messages
-- --
2.43.5 2.44.0

@ -1,4 +1,4 @@
From da01c87c5fc2c2d14fc05b0bccbe47f2e8f6f142 Mon Sep 17 00:00:00 2001 From 656b7931e60d6e25323e3ae46e2f15fc7d550ff3 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Wed, 4 Oct 2023 17:41:16 +0300 Date: Wed, 4 Oct 2023 17:41:16 +0300
Subject: [PATCH 09/15] Set Russian as default language for new regions Subject: [PATCH 09/15] Set Russian as default language for new regions
@ -8,10 +8,10 @@ Subject: [PATCH 09/15] Set Russian as default language for new regions
1 file changed, 11 insertions(+) 1 file changed, 11 insertions(+)
diff --git a/pyanaconda/modules/timezone/initialization.py b/pyanaconda/modules/timezone/initialization.py diff --git a/pyanaconda/modules/timezone/initialization.py b/pyanaconda/modules/timezone/initialization.py
index 3b97a4d..ebe5e7c 100644 index 0ef8d09..f8f5848 100644
--- a/pyanaconda/modules/timezone/initialization.py --- a/pyanaconda/modules/timezone/initialization.py
+++ b/pyanaconda/modules/timezone/initialization.py +++ b/pyanaconda/modules/timezone/initialization.py
@@ -101,6 +101,17 @@ class GeolocationTask(Task): @@ -97,6 +97,17 @@ class GeolocationTask(Task):
territory = json_reply.get("country_code", "") territory = json_reply.get("country_code", "")
timezone = json_reply.get("time_zone", "") timezone = json_reply.get("time_zone", "")
@ -30,5 +30,5 @@ index 3b97a4d..ebe5e7c 100644
if not is_valid_timezone(timezone): if not is_valid_timezone(timezone):
# try to get a timezone from the territory code # try to get a timezone from the territory code
-- --
2.43.5 2.44.0

@ -1,26 +1,50 @@
From 76b2065edce9b4e3f3b9fab80ce04ad35f096a61 Mon Sep 17 00:00:00 2001 From 60ffb83455ecba7fccef1044e7eb17b55c589c44 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru> From: Eugene Zamriy <eugene@zamriy.info>
Date: Thu, 19 Dec 2024 21:38:09 +0300 Date: Wed, 19 Apr 2023 12:06:57 +0300
Subject: [PATCH 10/15] Set English as fallback language for help Subject: [PATCH 10/15] Set English as fallback language for help
--- ---
pyanaconda/core/constants.py | 3 +++ pyanaconda/core/constants.py | 4 ++++
1 file changed, 3 insertions(+) pyanaconda/ui/lib/help.py | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index e2f5d1a..9698270 100644 index 84b03e3..b7c2e5e 100644
--- a/pyanaconda/core/constants.py --- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py
@@ -79,6 +79,9 @@ BACKEND_READY_FLAG_FILE = "/run/anaconda/backend_ready" @@ -74,6 +74,10 @@ ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf"
# NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8 # NOTE: this should be LANG_TERRITORY.CODESET, e.g. en_US.UTF-8
DEFAULT_LANG = "ru_RU.UTF-8" DEFAULT_LANG = "ru_RU.UTF-8"
+# NOTE: MSVSphere change, set English as a fallback help language because +# NOTE: MSVSphere change, set English as a fallback help language because
+# we use Russian by default for UI +# we use Russian by default for UI
+DEFAULT_HELP_LANG = "en_US.UTF-8" +DEFAULT_HELP_LANG = "en_US.UTF-8"
+
DEFAULT_VC_FONT = "eurlatgr" DEFAULT_VC_FONT = "eurlatgr"
DEFAULT_KEYBOARD = "us"
diff --git a/pyanaconda/ui/lib/help.py b/pyanaconda/ui/lib/help.py
index 271e587..b8f424d 100644
--- a/pyanaconda/ui/lib/help.py
+++ b/pyanaconda/ui/lib/help.py
@@ -25,7 +25,7 @@ from collections import namedtuple
from pyanaconda.anaconda_loggers import get_module_logger
from pyanaconda.core.configuration.anaconda import conf
-from pyanaconda.core.constants import DEFAULT_LANG, DisplayModes
+from pyanaconda.core.constants import DEFAULT_HELP_LANG, DisplayModes
from pyanaconda.core.util import startProgram, join_paths
from pyanaconda.localization import find_best_locale_match
@@ -224,7 +224,7 @@ def _find_best_help_file(current_locale, available_files):
:param dict available_files: a dictionary of langcodes and help paths
:return str: a path to the best help file or None
"""
- for locale in (current_locale, DEFAULT_LANG):
+ for locale in (current_locale, DEFAULT_HELP_LANG):
best_lang = find_best_locale_match(locale, available_files.keys())
best_path = available_files.get(best_lang, None)
-- --
2.43.5 2.44.0

File diff suppressed because it is too large Load Diff

@ -1,25 +1,40 @@
From f39bc62bdbf2fe663d53d19454b2c5c4f42b71b5 Mon Sep 17 00:00:00 2001 From d89d1e6358188e8f3f3f595cc8af4d90dd78987e Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru> From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 3 Apr 2024 10:12:41 +0300 Date: Wed, 3 Apr 2024 10:12:41 +0300
Subject: [PATCH 12/15] Enable administrator by default Subject: [PATCH 12/15] Enable administrator by default
--- ---
pyanaconda/ui/lib/users.py | 2 ++ pyanaconda/ui/gui/spokes/user.glade | 1 +
1 file changed, 2 insertions(+) pyanaconda/ui/lib/users.py | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/user.glade b/pyanaconda/ui/gui/spokes/user.glade
index 3d52a93..c070066 100644
--- a/pyanaconda/ui/gui/spokes/user.glade
+++ b/pyanaconda/ui/gui/spokes/user.glade
@@ -267,6 +267,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
+ <property name="active">True</property>
<property name="tooltip-text" translatable="yes" context="GUI|User">Allow this user to run the 'sudo' command.</property>
<property name="use-underline">True</property>
<property name="xalign">0</property>
diff --git a/pyanaconda/ui/lib/users.py b/pyanaconda/ui/lib/users.py diff --git a/pyanaconda/ui/lib/users.py b/pyanaconda/ui/lib/users.py
index 9475075..08d96db 100644 index 2ea6a6f..a0cc1ec 100644
--- a/pyanaconda/ui/lib/users.py --- a/pyanaconda/ui/lib/users.py
+++ b/pyanaconda/ui/lib/users.py +++ b/pyanaconda/ui/lib/users.py
@@ -79,6 +79,8 @@ def get_user_list(users_module, add_default=False, add_if_not_empty=False): @@ -79,7 +79,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 # 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 # a populated list the add_if_not_empty option needs to be used
if not user_data_list or add_if_not_empty: if not user_data_list or add_if_not_empty:
- user_data_list.insert(0, UserData())
+ data = UserData() + data = UserData()
+ data.set_admin_priviledges(True) + data.set_admin_priviledges(True)
data = UserData() + user_data_list.insert(0, data)
data.set_admin_priviledges(True)
user_data_list.insert(0, data) return user_data_list
-- --
2.43.5 2.44.0

File diff suppressed because it is too large Load Diff

@ -0,0 +1,130 @@
From db3ef1af1713398ef082b0c00875efefffe51d62 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Wed, 3 Apr 2024 10:27:12 +0300
Subject: [PATCH 14/15] Make branding free Russian translation
---
po/ru.po | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/po/ru.po b/po/ru.po
index 77dceed..0c1143b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -845,7 +845,7 @@ msgid ""
"https://msvsphere-os.ru."
msgstr ""
"Это аппаратное обеспечение (или их комбинация) не поддерживается "
-"МСВСфера ОС. Для получения дополнительной информации о поддерживаемом "
+"операционной системой. Для получения дополнительной информации о поддерживаемом "
"оборудовании см. https://msvsphere-os.ru."
#: pyanaconda/core/constants.py:163
@@ -2027,7 +2027,7 @@ msgid ""
"recommended for a normal %(productName)s install."
msgstr ""
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
-"размера для обычной установки МСВСфера ОС."
+"размера для обычной установки операционной системы."
#: pyanaconda/modules/storage/checker/utils.py:131
#, python-format
@@ -3545,7 +3545,7 @@ msgid ""
"You haven't created any mount points for your %(product)s %(version)s "
"installation yet. You can:"
msgstr ""
-"Вы еще не создали точки монтирования для установки МСВСфера ОС %(version)s. "
+"Вы еще не создали точки монтирования для установки операционной системы. "
"Вы можете:"
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
@@ -3592,7 +3592,7 @@ msgid ""
"of available space, including <b>%(software)s</b> for software and "
"<b>%(swap)s</b> for swap space."
msgstr ""
-"Для установки <b>МСВСфера ОС</b> требуется <b>%(total)s</b>, в том числе "
+"Для установки <b>операционной системы</b> требуется <b>%(total)s</b>, в том числе "
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81
@@ -3602,8 +3602,8 @@ msgid ""
"selection</a> requires <b>%(total)s</b> of available space, including "
"<b>%(software)s</b> for software and <b>%(swap)s</b> for swap space."
msgstr ""
-"Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения "
-"<b>МСВСфера ОС</b></a> требуется <b>%(total)s</b> пространства, в том числе "
+"Для <a href=\"\" title=\"%(tooltip)s\">установки "
+"<b>операционной системы</b></a> требуется <b>%(total)s</b> пространства, в том числе "
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132
@@ -3618,7 +3618,7 @@ msgid ""
"or remove existing partitions via our guided reclaim space tool, or you can "
"adjust your partitions on your own in the custom partitioning interface."
msgstr ""
-"<b>Недостаточно места для установки %(name)s</b>. Можно уменьшить или удалить "
+"<b>Недостаточно места для установки операционной системы</b>. Можно уменьшить или удалить "
"существующие разделы с помощью помощника или самостоятельно выбрать размеры "
"разделов в окне настройки разделов."
@@ -3628,7 +3628,7 @@ msgid ""
" You don't have enough space available to install <b>%(product)s</b>, even "
"if you used all of the free space available on the selected disks."
msgstr ""
-" Недостаточно места для установки <b>МСВСфера ОС</b>, даже если "
+" Недостаточно места для установки <b>операционной системы</b>, даже если "
"использовать все свободное место на выбранных дисках."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178
@@ -3639,10 +3639,10 @@ msgid ""
"could add more disks for additional space, modify your software selection to "
"install a smaller version of <b>%(productName)s</b>, or quit the installer."
msgstr ""
-"<b>Недостаточно места для установки МСВСфера ОС</b>, даже если "
+"<b>Недостаточно места для установки операционной системы</b>, даже если "
"использовать всё свободное место на выбранных дисках. Можно добавить ещё "
"диски, чтобы получить дополнительное место, изменить выбор программного "
-"обеспечения, чтобы установить меньший вариант <b>МСВСфера ОС</b>, или "
+"обеспечения, чтобы установить меньший вариант <b>системы</b>, или "
"покинуть программу установки."
#: pyanaconda/ui/gui/spokes/lib/subscription.py:66
@@ -4190,7 +4190,7 @@ msgid ""
"you'll be able to view their details here."
msgstr ""
"Здесь будет показана информация о созданных точках монтирования для "
-"установки МСВСфера %(version)s OC."
+"установки операционной системы."
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
@@ -4603,20 +4603,20 @@ msgstr "_Завершить установку"
#: pyanaconda/ui/gui/spokes/installation_progress.py:158
#, python-format
msgid ""
-"%s is now successfully installed and ready for you to use!\n"
+"%(name)s is now successfully installed and ready for you to use!\n"
"Go ahead and reboot your system to start using it!"
msgstr ""
-"МСВСфера ОС установлена и готова к работе.\n"
-"Необходимо перезагрузить систему чтобы приступить к использованию."
+"Операционная система установлена и готова к работе.\n"
+"Необходимо перезагрузить компьютер, чтобы приступить к использованию."
#: pyanaconda/ui/gui/spokes/installation_progress.py:163
#, python-format
msgid ""
-"%s is now successfully installed and ready for you to use!\n"
+"%(name)s is now successfully installed and ready for you to use!\n"
"Go ahead and quit the application to start using it!"
msgstr ""
-"МСВСфера ОС установлена и готова к работе.\n"
-"Необходимо выйти из приложения чтобы приступить к использованию."
+"Операционная система установлена и готова к работе.\n"
+"Необходимо выйти из приложения, чтобы приступить к использованию."
#: pyanaconda/ui/gui/spokes/installation_source.py:73
msgid "Setting up installation source..."
--
2.44.0

@ -1,34 +0,0 @@
From 74dacc06bd34591593b34add271f452a07d72b61 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Tue, 22 Oct 2024 17:29:08 +0300
Subject: [PATCH 15/15] Change docs site
---
pyanaconda/core/constants.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 23614af..0e1156f 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -168,7 +168,7 @@ WARNING_SMT_ENABLED_GUI = N_(
"improvements for certain workloads, but introduces several publicly "
"disclosed security issues. You have the option of disabling SMT, which "
"may impact performance. If you choose to leave SMT enabled, please read "
- "https://red.ht/rhel-smt to understand your potential risks and learn "
+ "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand your potential risks and learn "
"about other ways to mitigate these risks."
)
@@ -177,7 +177,7 @@ WARNING_SMT_ENABLED_TUI = N_(
"Simultaneous Multithreading (SMT) may improve performance for certain "
"workloads, but introduces several publicly disclosed security issues. "
"You can disable SMT, which may impact performance. Please read "
- "https://red.ht/rhel-smt to understand potential risks and learn about "
+ "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand potential risks and learn about "
"ways to mitigate these risks."
)
--
2.43.5

@ -0,0 +1,98 @@
From 667ff8db6e0a78ee05cf41b768da8ec8fbc23858 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 25 Dec 2023 14:51:32 +0300
Subject: [PATCH 15/15] Drop sphere url
---
po/ru.po | 16 ++++++++--------
pyanaconda/core/constants.py | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/po/ru.po b/po/ru.po
index f9ad24e..4619491 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -463,11 +463,11 @@ msgstr ""
msgid ""
"This hardware (or a combination thereof) is not supported by MSVSphere. "
"For more information on supported hardware, please refer to "
-"https://msvsphere-os.ru."
+"documentation."
msgstr ""
"Это аппаратное обеспечение (или их комбинация) не поддерживается "
"операционной системой. Для получения дополнительной информации о поддерживаемом "
-"оборудовании см. https://msvsphere-os.ru."
+"оборудовании см. документацию."
#: pyanaconda/core/constants.py:163
msgid ""
@@ -486,29 +486,29 @@ msgid ""
"Simultaneous Multithreading (SMT) technology can provide performance "
"improvements for certain workloads, but introduces several publicly "
"disclosed security issues. You have the option of disabling SMT, which may "
-"impact performance. If you choose to leave SMT enabled, please read https://"
-"docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand your potential risks and learn about other "
+"impact performance. If you choose to leave SMT enabled, please read "
+"documentation to understand your potential risks and learn about other "
"ways to mitigate these risks."
msgstr ""
"Технология одновременной многопоточности (SMT) может обеспечить повышение "
"производительности при определенных рабочих нагрузках, но привносит "
"несколько известных проблем безопасности. Вы можете отключить SMT, что может "
"повлиять на производительность. Если вы решите оставить SMT включенным, "
-"прочитайте https://docs.msvsphere-os.ru/knowledge-base/security/smt.html для понимания потенциальных рисков и "
+"прочитайте документацию для понимания потенциальных рисков и "
"чтобы узнать о других способах снижения этих рисков."
#: pyanaconda/core/constants.py:183
msgid ""
"Simultaneous Multithreading (SMT) may improve performance for certain "
"workloads, but introduces several publicly disclosed security issues. You "
-"can disable SMT, which may impact performance. Please read https://docs.msvsphere-os.ru/"
-"knowledge-base/security/smt.html to understand potential risks and learn about ways to mitigate "
+"can disable SMT, which may impact performance. Please read "
+"documentation to understand potential risks and learn about ways to mitigate "
"these risks."
msgstr ""
"Одновременная многопоточность (SMT) может увеличить производительность при "
"определенных рабочих нагрузках, но привносит несколько известных проблем "
"безопасности. Можно отключить SMT, что может повлиять на производительность. "
-"Прочитайте https://docs.msvsphere-os.ru/knowledge-base/security/smt.html для понимания потенциальных рисков и "
+"Прочитайте документацию для понимания потенциальных рисков и "
"чтобы узнать о способах снижения этих рисков."
#: pyanaconda/core/constants.py:199
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index b00c276..1b6aee3 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -161,7 +161,7 @@ WARNING_SUPPORT_REMOVED = N_(
WARNING_HARDWARE_UNSUPPORTED = N_(
"This hardware (or a combination thereof) is not supported by MSVSphere. For more information "
- "on supported hardware, please refer to https://msvsphere-os.ru."
+ "on supported hardware, please refer to documentation."
)
# Storage messages
@@ -180,7 +180,7 @@ WARNING_SMT_ENABLED_GUI = N_(
"improvements for certain workloads, but introduces several publicly "
"disclosed security issues. You have the option of disabling SMT, which "
"may impact performance. If you choose to leave SMT enabled, please read "
- "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand your potential risks and learn "
+ "documentation to understand your potential risks and learn "
"about other ways to mitigate these risks."
)
@@ -189,7 +189,7 @@ WARNING_SMT_ENABLED_TUI = N_(
"Simultaneous Multithreading (SMT) may improve performance for certain "
"workloads, but introduces several publicly disclosed security issues. "
"You can disable SMT, which may impact performance. Please read "
- "https://docs.msvsphere-os.ru/knowledge-base/security/smt.html to understand potential risks and learn about "
+ "documentation to understand potential risks and learn about "
"ways to mitigate these risks."
)
--
2.43.0

@ -1,26 +1,25 @@
From 52378334637cfba5e35a38d1bb0e1476273709d2 Mon Sep 17 00:00:00 2001 From b9fe4624a8f34bac765fd2788abebfec429cc0a2 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <sergey.cherevko@softline.com> From: tigro <tigro@msvsphere-os.ru>
Date: Fri, 20 Dec 2024 00:19:31 +0300 Date: Mon, 12 Aug 2024 12:29:06 +0300
Subject: [PATCH 13/15] Set latarcyrheb-sun16 as default font instead of Subject: [PATCH 16/16] Set LatGrkCyr-8x16 as default font instead of eurlatgr
eurlatgr
--- ---
pyanaconda/core/constants.py | 2 +- pyanaconda/core/constants.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 9698270..23614af 100644 index 78577cb..0bd5227 100644
--- a/pyanaconda/core/constants.py --- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py
@@ -83,7 +83,7 @@ DEFAULT_LANG = "ru_RU.UTF-8" @@ -78,7 +78,7 @@ DEFAULT_LANG = "ru_RU.UTF-8"
# we use Russian by default for UI # we use Russian by default for UI
DEFAULT_HELP_LANG = "en_US.UTF-8" DEFAULT_HELP_LANG = "en_US.UTF-8"
-DEFAULT_VC_FONT = "eurlatgr" -DEFAULT_VC_FONT = "eurlatgr"
+DEFAULT_VC_FONT = "latarcyrheb-sun16" +DEFAULT_VC_FONT = "LatGrkCyr-8x16"
DEFAULT_KEYBOARD = "us" DEFAULT_KEYBOARD = "us"
-- --
2.43.5 2.46.0

@ -1,83 +1,55 @@
From 3bf1f830f6f816b00cf3b3449cb94df744d9295a Mon Sep 17 00:00:00 2001 From 2716b292b9d42961222fd645c6b2d281d46d6688 Mon Sep 17 00:00:00 2001
From: Dmitry Samoylik <Dmitriy.Samoylik@softline.com> From: Dmitry Samoylik <Dmitriy.Samoylik@softline.com>
Date: Thu, 26 Sep 2024 16:57:48 +0300 Date: Thu, 26 Sep 2024 16:57:48 +0300
Subject: [PATCH 14/15] Implement show EULA before installation Subject: [PATCH] Implement show EULA before installation
--- ---
data/anaconda.conf | 1 + data/anaconda.conf | 4 +-
po/ru.po | 31 ++++++
pyanaconda/core/configuration/eula.py | 23 ++++
pyanaconda/core/configuration/license.py | 2 - pyanaconda/core/configuration/license.py | 2 -
pyanaconda/core/eula.py | 23 ++++
pyanaconda/ui/categories/eula.py | 14 +++ pyanaconda/ui/categories/eula.py | 14 +++
pyanaconda/ui/gui/spokes/eula.glade | 136 +++++++++++++++++++++++ pyanaconda/ui/gui/spokes/eula.glade | 136 +++++++++++++++++++++++
pyanaconda/ui/gui/spokes/eula.py | 107 ++++++++++++++++++ pyanaconda/ui/gui/spokes/eula.py | 107 ++++++++++++++++++
pyanaconda/ui/tui/spokes/eula.py | 128 +++++++++++++++++++++ pyanaconda/ui/tui/spokes/eula.py | 128 +++++++++++++++++++++
8 files changed, 440 insertions(+), 2 deletions(-) 7 files changed, 409 insertions(+), 5 deletions(-)
create mode 100644 pyanaconda/core/configuration/eula.py create mode 100644 pyanaconda/core/eula.py
create mode 100644 pyanaconda/ui/categories/eula.py create mode 100644 pyanaconda/ui/categories/eula.py
create mode 100644 pyanaconda/ui/gui/spokes/eula.glade create mode 100644 pyanaconda/ui/gui/spokes/eula.glade
create mode 100644 pyanaconda/ui/gui/spokes/eula.py create mode 100644 pyanaconda/ui/gui/spokes/eula.py
create mode 100644 pyanaconda/ui/tui/spokes/eula.py create mode 100644 pyanaconda/ui/tui/spokes/eula.py
diff --git a/data/anaconda.conf b/data/anaconda.conf diff --git a/data/anaconda.conf b/data/anaconda.conf
index 498601b..51d10e9 100644 index b5878e3..c15e99d 100644
--- a/data/anaconda.conf --- a/data/anaconda.conf
+++ b/data/anaconda.conf +++ b/data/anaconda.conf
@@ -314,6 +314,7 @@ show_kernel_options = True @@ -308,9 +308,7 @@ password_policies =
# # If the given distribution has an EULA & feels the need to
# This is currently used just to show the path to the file to # tell the user about it fill in this variable by a path
# the user at the end of the installation. # pointing to a file with the EULA on the installed system.
-#
-# This is currently used just to show the path to the file to
-# the user at the end of the installation.
+ +
eula = eula =
diff --git a/po/ru.po b/po/ru.po diff --git a/pyanaconda/core/configuration/license.py b/pyanaconda/core/configuration/license.py
index 70bd42b..46eaef4 100644 index 04c44bf..a51f52a 100644
--- a/po/ru.po --- a/pyanaconda/core/configuration/license.py
+++ b/po/ru.po +++ b/pyanaconda/core/configuration/license.py
@@ -7383,6 +7383,37 @@ msgstr "К системе прикреплено {} подписок" @@ -31,7 +31,5 @@ class LicenseSection(Section):
msgid "{}. {}" tell the user about it fill in this variable by a path
msgstr "{}. {}" pointing to a file with the EULA on the installed system.
+msgid "LICENSING"
+msgstr "ЛИЦЕНЗИРОВАНИЕ"
+
+msgctxt "GUI|Spoke"
+msgid "_License Information"
+msgstr "О _лицензии"
+
+msgid "License information"
+msgstr "О лицензии"
+
+msgid "License Information"
+msgstr "О лицензии"
+
+msgid "License accepted"
+msgstr "Лицензия принята"
+
+msgid "License not accepted"
+msgstr "Лицензия не принята"
+
+msgid "Read the License Agreement"
+msgstr "Прочитайте лицензионное соглашение"
+
+msgid "I accept the license agreement"
+msgstr "Принимаю лицензионное соглашение"
+
+msgid "I _accept the license agreement"
+msgstr "_Принимаю лицензионное соглашение"
+
+msgid "License Agreement:"
+msgstr "Лицензионное соглашение:"
+
#~ msgid "Btrfs file system is not supported."
#~ msgstr "Файловая система btrfs не поддерживается."
diff --git a/pyanaconda/core/configuration/eula.py b/pyanaconda/core/configuration/eula.py - This is currently used just to show the path to the file to
- the user at the end of the installation.
"""
return self._get_option("eula", str)
diff --git a/pyanaconda/core/eula.py b/pyanaconda/core/eula.py
new file mode 100644 new file mode 100644
index 0000000..15a393e index 0000000..15a393e
--- /dev/null --- /dev/null
+++ b/pyanaconda/core/configuration/eula.py +++ b/pyanaconda/core/eula.py
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
+import os +import os
+from pyanaconda.core.configuration.anaconda import conf +from pyanaconda.core.configuration.anaconda import conf
@ -102,18 +74,6 @@ index 0000000..15a393e
+ :rtype: bool + :rtype: bool
+ """ + """
+ return bool(get_license_file_name()) + return bool(get_license_file_name())
diff --git a/pyanaconda/core/configuration/license.py b/pyanaconda/core/configuration/license.py
index 04c44bf..a51f52a 100644
--- a/pyanaconda/core/configuration/license.py
+++ b/pyanaconda/core/configuration/license.py
@@ -31,7 +31,5 @@ class LicenseSection(Section):
tell the user about it fill in this variable by a path
pointing to a file with the EULA on the installed system.
- This is currently used just to show the path to the file to
- the user at the end of the installation.
"""
return self._get_option("eula", str)
diff --git a/pyanaconda/ui/categories/eula.py b/pyanaconda/ui/categories/eula.py diff --git a/pyanaconda/ui/categories/eula.py b/pyanaconda/ui/categories/eula.py
new file mode 100644 new file mode 100644
index 0000000..0a4fe96 index 0000000..0a4fe96
@ -524,5 +484,5 @@ index 0000000..a3e8e62
+ self.close() + self.close()
+ return None + return None
-- --
2.43.5 2.39.2

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save