rpms
/
anaconda
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from i9-beta

Browse Source
al
Arkady L. Shane 9 months ago
parent aeb1785e99
commit 461dfd232b
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503
18 changed files with 998 additions and 776 deletions
Show Stats Download Patch File Download Diff File

2
.anaconda.metadata
Unescape View File

@ -1 +1 @@
fd622460d3b14e4cf3d1b48cfd08bfb20258b18d SOURCES/anaconda-34.25.2.10.tar.bz2
bad3a78526536052137a0a1316476538fef0b299 SOURCES/anaconda-34.25.3.8.tar.bz2

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
SOURCES/anaconda-34.25.2.10.tar.bz2
SOURCES/anaconda-34.25.3.8.tar.bz2

8
SOURCES/0001-Disable-subscription.patch
Unescape View File

@ -1,17 +1,17 @@
From 74d0f49183defed29b2453349e799074898a5f08 Mon Sep 17 00:00:00 2001
From a79b7a9a0119268617621b78737722269fd5d1f1 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 12:53:14 +0300
Subject: [PATCH 01/11] Disable subscription
Subject: [PATCH 01/13] 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 9e74fc6..ef214b6 100644
index 4d03689..3b0e6c0 100644
--- a/pyanaconda/ui/gui/spokes/subscription.py
+++ b/pyanaconda/ui/gui/spokes/subscription.py
@@ -533,6 +533,10 @@ class SubscriptionSpoke(NormalSpoke):
@@ -551,6 +551,10 @@ class SubscriptionSpoke(NormalSpoke):
# also set the spoke warning banner
self.show_warning_message(error_message)

8
SOURCES/0002-Hide-CDN-source-button.patch
Unescape View File

@ -1,17 +1,17 @@
From 56351f7b9524fdf810d523a0ed5156e0f1453ba0 Mon Sep 17 00:00:00 2001
From e1441025f22f25c41e1ed2d72ff48cad198c2adb Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 12:54:58 +0300
Subject: [PATCH 02/11] Hide CDN source button
Subject: [PATCH 02/13] 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 8a0f463..adc85b5 100644
index c467bd3..398ac11 100644
--- a/pyanaconda/ui/gui/spokes/installation_source.py
+++ b/pyanaconda/ui/gui/spokes/installation_source.py
@@ -784,6 +784,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_box = self.builder.get_object("networkBox")

4
SOURCES/0003-Set-MSVSphere-installer-colors.patch
Unescape View File

@ -1,7 +1,7 @@
From 513cd326ad706a71a7c5686dfe0f6adc0073722b Mon Sep 17 00:00:00 2001
From fc94554299be1657536d4ed3d18e09673fee8713 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 12:56:19 +0300
Subject: [PATCH 03/11] Set MSVSphere installer colors
Subject: [PATCH 03/13] Set MSVSphere installer colors
---
data/anaconda-gtk.css | 3 ++-

6
SOURCES/0004-Add-Minimal-and-Server-repository-support.patch
Unescape View File

@ -1,14 +1,14 @@
From bf225c3ea3dcd23b23ca27e0fc0052ce933ef5d9 Mon Sep 17 00:00:00 2001
From ac96b00ea3b3fe15c841e9cb08ad61d124228a87 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <evgeniy.zamriy@softline.com>
Date: Fri, 28 Jul 2023 23:47:23 +0300
Subject: [PATCH 04/11] Add Minimal and Server repository support
Subject: [PATCH 04/13] 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 2f62cce..6b26663 100644
index df360a0..21c410a 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -58,7 +58,9 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(),

18
SOURCES/0005-Set-default-timezone-to-Europe-Moscow.patch
Unescape View File

@ -1,7 +1,7 @@
From 4462116895cf04abb6fb7dee76e65636d248fb40 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 12:59:20 +0300
Subject: [PATCH 05/11] Set default timezone to Europe/Moscow
From 2bb2cb74d40b692cd694e43e7e94883beef6d7d3 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Wed, 4 Oct 2023 17:34:35 +0300
Subject: [PATCH 05/13] Set default timezone to Europe/Moscow
---
pyanaconda/modules/timezone/installation.py | 4 ++--
@ -25,20 +25,20 @@ index d6dfd7b..984646d 100644
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
index ac5318c..42e0cfe 100644
--- a/pyanaconda/modules/timezone/timezone.py
+++ b/pyanaconda/modules/timezone/timezone.py
@@ -44,7 +44,7 @@ class TimezoneService(KickstartService):
@@ -46,7 +46,7 @@ class TimezoneService(KickstartService):
def __init__(self):
super().__init__()
self.timezone_changed = Signal()
- self._timezone = "America/New_York"
+ self._timezone = "Europe/Moscow"
self._priority = TIMEZONE_PRIORITY_DEFAULT
self.is_utc_changed = Signal()
self._is_utc = False
self.geolocation_result_changed = Signal()
diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py
index 1129036..3b253f7 100644
index c99f451..bd6839d 100644
--- a/pyanaconda/ui/gui/spokes/datetime_spoke.py
+++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py
@@ -69,7 +69,7 @@ SERVER_WORKING = 3

4
SOURCES/0006-Add-MSVSphere-product-config.patch
Unescape View File

@ -1,7 +1,7 @@
From 1e50329106088529044524dd789dadb5dd4f39fd Mon Sep 17 00:00:00 2001
From 805711f02da4a60a78fbf3731a089ea0db005c9d Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 14:59:53 +0300
Subject: [PATCH 06/11] Add MSVSphere product config
Subject: [PATCH 06/13] Add MSVSphere product config
---
data/product.d/msvsphere.conf | 21 +++++++++++++++++++++

6
SOURCES/0007-Set-Russian-language-as-default.patch
Unescape View File

@ -1,14 +1,14 @@
From 050ea07607633f548e27136cbe1ac50bbe5452b4 Mon Sep 17 00:00:00 2001
From 8408a70c71e4cf41e09871d01a81ef25fcab0d33 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 18:00:57 +0300
Subject: [PATCH 07/11] Set Russian language as default
Subject: [PATCH 07/13] 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 6b26663..a162b81 100644
index 21c410a..10b93c7 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -72,7 +72,7 @@ ANACONDA_CONFIG_DIR = "/etc/anaconda/"

8
SOURCES/0008-Replace-Fedora-references-and-update-translations.patch
Unescape View File

@ -1,7 +1,7 @@
From 7da10ef83112c346bcdad0a4ade8766d7b65c398 Mon Sep 17 00:00:00 2001
From 9ef513074e087b53bb318065eee8885de8c51ba2 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Fri, 14 Apr 2023 18:23:29 +0300
Subject: [PATCH 08/11] Replace Fedora references and update translations
Subject: [PATCH 08/13] Replace Fedora references and update translations
---
data/liveinst/gnome/fedora-welcome.desktop | 3 ++-
@ -83,10 +83,10 @@ index 847078d..6d9c4b3 100644
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index a162b81..966b2ac 100644
index 10b93c7..11d7d46 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -158,8 +158,8 @@ WARNING_SUPPORT_REMOVED = N_(
@@ -156,8 +156,8 @@ WARNING_SUPPORT_REMOVED = N_(
)
WARNING_HARDWARE_UNSUPPORTED = N_(

29
SOURCES/0009-Set-Russian-as-default-language-for-new-regions.patch
Unescape View File

@ -1,19 +1,19 @@
From 853ed63e0a3a73b73b0354bcab1ce8c11894e63e Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Mon, 17 Apr 2023 23:48:13 +0300
Subject: [PATCH 09/11] Set Russian as default language for new regions
From c9ff22033280adfc7279f21a389247dc5d4fe427 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Wed, 4 Oct 2023 17:41:16 +0300
Subject: [PATCH 09/13] Set Russian as default language for new regions
---
pyanaconda/geoloc.py | 10 ++++++++++
1 file changed, 10 insertions(+)
pyanaconda/modules/timezone/initialization.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/pyanaconda/geoloc.py b/pyanaconda/geoloc.py
index 3555f24..4808c83 100644
--- a/pyanaconda/geoloc.py
+++ b/pyanaconda/geoloc.py
@@ -468,6 +468,16 @@ class FedoraGeoIPProvider(GeolocationBackend):
timezone_source = "GeoIP"
timezone_code = json_reply.get("time_zone", None)
diff --git a/pyanaconda/modules/timezone/initialization.py b/pyanaconda/modules/timezone/initialization.py
index 0ef8d09..f8f5848 100644
--- a/pyanaconda/modules/timezone/initialization.py
+++ b/pyanaconda/modules/timezone/initialization.py
@@ -97,6 +97,17 @@ class GeolocationTask(Task):
territory = json_reply.get("country_code", "")
timezone = json_reply.get("time_zone", "")
+ # set Russian as default language for new regions
+ if territory == "UA":
@ -25,8 +25,9 @@ index 3555f24..4808c83 100644
+ 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):
if not is_valid_timezone(timezone):
# try to get a timezone from the territory code
--
2.41.0

6
SOURCES/0010-Set-English-as-fallback-language-for-help.patch
Unescape View File

@ -1,7 +1,7 @@
From 6a2201e338bbafa5673d18b2436e02af64893789 Mon Sep 17 00:00:00 2001
From 70c61ddf9dc75a7a4015f255985cef18fa4e37bb Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <eugene@zamriy.info>
Date: Wed, 19 Apr 2023 12:06:57 +0300
Subject: [PATCH 10/11] Set English as fallback language for help
Subject: [PATCH 10/13] Set English as fallback language for help
---
pyanaconda/core/constants.py | 4 ++++
@ -9,7 +9,7 @@ Subject: [PATCH 10/11] Set English as fallback language for help
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 966b2ac..d1950d9 100644
index 11d7d46..0a970e0 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -74,6 +74,10 @@ ANACONDA_CONFIG_TMP = "/run/anaconda/anaconda.conf"

289
SOURCES/0011-Add-MSVSphere-identification-support.patch
Unescape View File

@ -1,18 +1,19 @@
From b8b9f50e29372aa35a0c7e7a0b329b5561f2e834 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <evgeniy.zamriy@softline.com>
Date: Thu, 18 May 2023 11:38:45 +0300
From c4ce2dc3afb422937a85a4a2e888b1a3a282672b Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Tue, 24 Oct 2023 12:41:45 +0300
Subject: [PATCH 11/11] Add MSVSphere identification support
---
data/liveinst/gnome/fedora-welcome.desktop | 4 +-
data/liveinst/gnome/fedora-welcome.js | 2 +-
po/ru.po | 200 ++++++++++++++----
po/ru.po | 190 +++++++++++++++---
pyanaconda/product.py | 36 +++-
.../ui/gui/spokes/installation_progress.py | 8 +-
pyanaconda/ui/gui/spokes/lib/accordion.py | 2 +-
.../ui/gui/spokes/lib/storage_dialogs.py | 4 +-
pyanaconda/ui/gui/spokes/welcome.py | 21 +-
pyanaconda/vnc.py | 42 +++-
8 files changed, 264 insertions(+), 53 deletions(-)
9 files changed, 260 insertions(+), 49 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
index 90f5678..abbbff3 100644
@ -41,71 +42,33 @@ index 4c0a66a..120d718 100755
this.window.connect('key-press-event', Lang.bind(this,
function(w, event) {
diff --git a/po/ru.po b/po/ru.po
index c478f3f..85c8dc7 100644
index 8340e9e..7eed72b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -375,7 +375,37 @@ msgid ""
"Would you like to ignore this and continue with installation?"
msgstr ""
-#: pyanaconda/product.py:69
+#: pyanaconda/product.py:83
+#, python-format
+msgid "MSVSphere %(productVersion)s Server INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сервер"
+
+#: pyanaconda/product.py:85
+#, python-format
+msgid "MSVSphere %(productVersion)s ARM INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ"
+
+#: pyanaconda/product.py:87
+#, python-format
+msgid "MSVSphere %(productVersion)s Cinnamon INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Cinnamon"
+
+#: pyanaconda/product.py:89
+#, python-format
+msgid "MSVSphere %(productVersion)s KDE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s KDE"
+
+#: pyanaconda/product.py:91
+#, python-format
+msgid "MSVSphere %(productVersion)s XFCE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s XFCE"
+
+#: pyanaconda/product.py:93
+#, python-format
+msgid "MSVSphere %(productVersion)s OS INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС"
+
+#: pyanaconda/product.py:95
#, python-format
msgid "%(productName)s %(productVersion)s INSTALLATION"
msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
@@ -1152,7 +1182,7 @@ msgstr ""
@@ -461,13 +461,13 @@ msgstr ""
#: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151
msgid "Help!"
-msgstr "Помогите!"
+msgstr "Справка"
#: pyanaconda/ui/gui/__init__.py:854
#: pyanaconda/ui/gui/spokes/lib/detailederror.py:58
@@ -1182,7 +1212,7 @@ msgid ""
"\"\">Click for details.</a>"
#: pyanaconda/core/constants.py:157
msgid ""
-"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."
msgstr ""
"Предупреждение: в процессоре включена одновременная многопоточность (SMT). "
-"<a href=\"\">Нжмите для получения дополнительной информации.</a>"
+"<a href=\"\">Нажмите для получения дополнительной информации.</a>"
-"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. "
-"Для получения дополнительной информации о поддерживаемом оборудовании см. "
-"http://www.redhat.com/hardware."
+"Это аппаратное обеспечение (или их комбинация) не поддерживается "
+"МСВСфера ОС. Для получения дополнительной информации о поддерживаемом "
+"оборудовании см. https://msvsphere-os.ru."
#: pyanaconda/ui/gui/hubs/summary.py:103
#: pyanaconda/core/constants.py:163
msgid ""
@@ -1424,7 +1454,37 @@ msgctxt "GUI|Custom Partitioning|Reset Dialog"
msgid "_Preserve current selections"
msgstr "О_ставить текущий выбор"
@@ -932,6 +932,36 @@ msgstr "Заполните отмеченные секции, прежде че
msgid "What language would you like to use during the installation process?"
msgstr "Какой язык вы хотите использовать в процессе установки?"
-#: pyanaconda/ui/gui/spokes/welcome.py:274
+#: pyanaconda/ui/gui/spokes/welcome.py:278
+#, python-format
+msgid "WELCOME TO MSVSphere %(version)s Server"
@ -136,49 +99,37 @@ index c478f3f..85c8dc7 100644
+msgid "WELCOME TO MSVSphere %(version)s OS"
+msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС"
+
+#: pyanaconda/ui/gui/spokes/welcome.py:290
#: pyanaconda/ui/gui/spokes/welcome.py:209
#, python-format
msgid "WELCOME TO %(name)s %(version)s."
msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s."
@@ -1944,7 +2004,7 @@ msgid ""
"You haven't created any mount points for your %(product)s %(version)s "
"installation yet. You can:"
@@ -1834,7 +1864,7 @@ msgid ""
"you'll be able to view their details here."
msgstr ""
-"Вы еще не создали точки монтирования для установки %(product)s %(version)s. "
+"Вы еще не создали точки монтирования для установки МСВСфера %(version)s ОС. "
"Вы можете:"
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
@@ -1976,6 +2036,10 @@ msgstr ""
"_Автоматически созданные точки монтирования могут быть зашифрованы по "
"умолчанию:"
"Здесь будет показана информация о созданных точках монтирования для "
-"установки %(name)s %(version)s."
+"установки МСВСфера %(version)s OC."
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:547
+msgid "Encrypt my data."
+msgstr "Зашифровать данные."
+
#: pyanaconda/ui/gui/spokes/lib/network_secret_agent.py:180
#: pyanaconda/ui/gui/spokes/lib/network_secret_agent.glade:95
msgid "Authentication required by wireless network"
@@ -2024,7 +2088,7 @@ msgid ""
"of available space, including <b>%(software)s</b> for software and <b>"
"%(swap)s</b> for swap space."
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
@@ -1931,7 +1961,7 @@ msgid ""
"of available space, including <b>%(software)s</b> for software and "
"<b>%(swap)s</b> for swap space."
msgstr ""
-"Для установки <b>%(product)s</b> требуется <b>%(total)s</b>, в том числе <b>"
+"Для установки <b>МСВСфера ОС</b> требуется <b>%(total)s</b>, в том числе <b>"
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
-"Для установки <b>%(product)s</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
@@ -2035,7 +2099,7 @@ msgid ""
"%(software)s</b> for software and <b>%(swap)s</b> for swap space."
@@ -1942,7 +1972,7 @@ msgid ""
"<b>%(software)s</b> for software and <b>%(swap)s</b> for swap space."
msgstr ""
"Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения <b>"
-"%(product)s</b></a> требуется <b>%(total)s</b> пространства, в том числе <b>"
+"МСВСфера ОС</b></a> требуется <b>%(total)s</b> пространства, в том числе <b>"
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
"Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения "
-"<b>%(product)s</b></a> требуется <b>%(total)s</b> пространства, в том числе "
+"<b>МСВСфера ОС</b></a> требуется <b>%(total)s</b> пространства, в том числе "
"<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132
@@ -2046,11 +2110,11 @@ msgstr "%s На выбранных дисках доступно:"
@@ -1953,11 +1983,11 @@ msgstr "%s На выбранных дисках доступно:"
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142
#, python-format
msgid ""
@ -192,7 +143,7 @@ index c478f3f..85c8dc7 100644
"существующие разделы с помощью помощника или самостоятельно выбрать размеры "
"разделов в окне настройки разделов."
@@ -2060,7 +2124,7 @@ msgid ""
@@ -1967,7 +1997,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 ""
@ -201,7 +152,7 @@ index c478f3f..85c8dc7 100644
"использовать все свободное место на выбранных дисках."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178
@@ -2071,10 +2135,10 @@ msgid ""
@@ -1978,10 +2008,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 ""
@ -213,13 +164,29 @@ index c478f3f..85c8dc7 100644
+"обеспечения, чтобы установить меньший вариант <b>МСВСфера ОС</b>, или "
"покинуть программу установки."
#: pyanaconda/ui/gui/spokes/lib/detailederror.py:48
@@ -2272,20 +2336,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"
#: pyanaconda/ui/gui/spokes/lib/network_secret_agent.py:180
@@ -2041,7 +2071,7 @@ msgid ""
"You haven't created any mount points for your %(product)s %(version)s "
"installation yet. You can:"
msgstr ""
-"Вы еще не создали точки монтирования для установки %(product)s %(version)s. "
+"Вы еще не создали точки монтирования для установки МСВСфера %(version)s OC. "
"Вы можете:"
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
@@ -2073,6 +2103,10 @@ msgstr ""
"_Автоматически созданные точки монтирования могут быть зашифрованы по "
"умолчанию:"
+#: pyanaconda/ui/gui/spokes/lib/accordion.py:547
+msgid "Encrypt my data."
+msgstr "Зашифровать данные."
+
#: pyanaconda/ui/gui/spokes/lib/subscription.py:66
msgid "Other ({})"
msgstr "Другой ({})"
@@ -2370,8 +2404,8 @@ msgid ""
"%s is now successfully installed and ready for you to use!\n"
"Go ahead and reboot your system to start using it!"
msgstr ""
-"%s успешно установлена и готова к использованию!\n"
@ -229,9 +196,8 @@ index c478f3f..85c8dc7 100644
#: 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"
@@ -2379,8 +2413,8 @@ msgid ""
"%s is now successfully installed and ready for you to use!\n"
"Go ahead and quit the application to start using it!"
msgstr ""
-"%s успешно установлено и готово к использованию!\n"
@ -239,18 +205,48 @@ index c478f3f..85c8dc7 100644
+"МСВСфера ОС установлена и готова к работе.\n"
+"Необходимо выйти из приложения чтобы приступить к использованию."
#: pyanaconda/ui/gui/spokes/software_selection.py:66
msgctxt "GUI|Spoke"
@@ -2448,7 +2512,7 @@ msgid ""
"you'll be able to view their details here."
msgstr ""
"Здесь будет показана информация о созданных точках монтирования для "
-"установки %(name)s %(version)s."
+"установки МСВСфера %(version)s ОС."
#: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151
msgid "Help!"
@@ -3183,7 +3217,37 @@ msgstr "Форматирование устройств DASD"
msgid "Probing storage"
msgstr "Проверка устройств хранения"
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
@@ -2868,7 +2932,7 @@ msgid ""
-#: pyanaconda/product.py:69
+#: pyanaconda/product.py:83
+#, python-format
+msgid "MSVSphere %(productVersion)s Server INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сервер"
+
+#: pyanaconda/product.py:85
+#, python-format
+msgid "MSVSphere %(productVersion)s ARM INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ"
+
+#: pyanaconda/product.py:87
+#, python-format
+msgid "MSVSphere %(productVersion)s Cinnamon INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s Cinnamon"
+
+#: pyanaconda/product.py:89
+#, python-format
+msgid "MSVSphere %(productVersion)s KDE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s KDE"
+
+#: pyanaconda/product.py:91
+#, python-format
+msgid "MSVSphere %(productVersion)s XFCE INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s XFCE"
+
+#: pyanaconda/product.py:93
+#, python-format
+msgid "MSVSphere %(productVersion)s OS INSTALLATION"
+msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС"
+
+#: pyanaconda/product.py:95
#, python-format
msgid "%(productName)s %(productVersion)s INSTALLATION"
msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
@@ -3422,7 +3486,7 @@ msgid ""
"recommended for a normal %(productName)s install."
msgstr ""
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
@ -259,7 +255,7 @@ index c478f3f..85c8dc7 100644
#: pyanaconda/modules/storage/checker/utils.py:131
#, python-format
@@ -3548,7 +3612,7 @@ msgstr "Не удалось продолжить установку."
@@ -3839,7 +3903,7 @@ msgstr "Не удалось сменить устройство."
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:213
#, python-brace-format
msgid "New {name} {version} Installation"
@ -268,29 +264,9 @@ index c478f3f..85c8dc7 100644
#: pyanaconda/modules/storage/partitioning/interactive/utils.py:275
msgid "Cannot set label on file system."
@@ -3959,13 +4023,13 @@ msgstr ""
#: pyanaconda/core/constants.py:159
msgid ""
-"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."
msgstr ""
-"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. "
-"Для получения дополнительной информации о поддерживаемом оборудовании см. "
-"http://www.redhat.com/hardware."
+"Это аппаратное обеспечение (или их комбинация) не поддерживается "
+"МСВСфера ОС. Для получения дополнительной информации о поддерживаемом "
+"оборудовании см. https://msvsphere-os.ru."
#: pyanaconda/core/constants.py:165
msgid ""
@@ -4303,12 +4367,72 @@ msgstr "не настроено"
msgid "Full name cannot contain colon characters"
msgstr "Полное имя не может содержать двоеточий"
@@ -4452,12 +4516,72 @@ msgstr "Для установки необходимо выбрать хотя
msgid "Invalid time source."
msgstr "Неверный источник времени."
-#: pyanaconda/vnc.py:79
+#: pyanaconda/vnc.py:81
@ -363,7 +339,7 @@ index c478f3f..85c8dc7 100644
#, python-format
msgid "%(productName)s %(productVersion)s installation on host %(name)s"
msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
@@ -7556,22 +7680,22 @@ msgstr "Установить Live CD на жёсткий диск"
@@ -7619,22 +7743,22 @@ msgstr "Настройка Liveinst"
#: data/liveinst/gnome/fedora-welcome.desktop:3
#: data/liveinst/gnome/fedora-welcome.js:65
@ -474,6 +450,19 @@ index c2dfbaf..de1fe76 100644
label = self.builder.get_object("rebootLabel")
label.set_text(continue_text)
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index 32801df..5e2e2b1 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -544,7 +544,7 @@ class CreateNewPage(BasePage):
)
self._createBox.attach(label, 0, 6, 2, 1)
- checkbox = Gtk.CheckButton(label="Encrypt my data.")
+ checkbox = Gtk.CheckButton(label=_("Encrypt my data."))
checkbox.connect("toggled", encrypted_changed_cb)
checkbox.set_active(default_encryption)
checkbox.set_margin_start(18)
diff --git a/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py b/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py
index 2f8338b..e330641 100644
--- a/pyanaconda/ui/gui/spokes/lib/storage_dialogs.py
@ -492,10 +481,10 @@ index 2f8338b..e330641 100644
self._add_modify_watcher(label)
diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py
index 2d8f6b2..3885c7c 100644
index de71615..7937f2c 100644
--- a/pyanaconda/ui/gui/spokes/welcome.py
+++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -34,7 +34,10 @@ from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
@@ -35,7 +35,10 @@ from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
from pyanaconda.ui.gui.spokes.lib.unsupported_hardware import UnsupportedHardwareDialog
from pyanaconda import localization
@ -505,10 +494,10 @@ index 2d8f6b2..3885c7c 100644
+ productFlavor
+)
from pyanaconda import flags
from pyanaconda import geoloc
from pyanaconda.core.i18n import _, C_
@@ -271,7 +274,21 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler):
# substituted.
from pyanaconda.core.i18n import _
from pyanaconda.core.util import ipmi_abort
@@ -206,7 +209,21 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler):
# The welcome label is special - it has text that needs to be substituted.
welcomeLabel = self.builder.get_object("welcomeLabel")
- welcomeLabel.set_text(_("WELCOME TO %(name)s %(version)s.") %

8
SOURCES/0012-Enable-administrator-by-default.patch
Unescape View File

@ -1,7 +1,7 @@
From 8f9c3cb9177b9371e605719c62d24ba34944b132 Mon Sep 17 00:00:00 2001
From 4c7d08a2a06f5fe4a7f6da8d26e8c642e8684578 Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Wed, 2 Aug 2023 20:04:35 +0200
Subject: [PATCH 12/12] Enable administrator by default
Subject: [PATCH 12/13] Enable administrator by default
---
pyanaconda/ui/gui/spokes/user.glade | 1 +
@ -9,10 +9,10 @@ Subject: [PATCH 12/12] Enable administrator by default
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/user.glade b/pyanaconda/ui/gui/spokes/user.glade
index 907818f..2bf7073 100644
index 3d52a93..c070066 100644
--- a/pyanaconda/ui/gui/spokes/user.glade
+++ b/pyanaconda/ui/gui/spokes/user.glade
@@ -265,6 +265,7 @@
@@ -267,6 +267,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>

932
SOURCES/0013-Fix-smt-url.patch
View File

File diff suppressed because it is too large Load Diff

120
SOURCES/0014-Make-branding-free-Russian-translation.patch
Unescape View File

@ -1,46 +1,55 @@
From 920bb55a968b54b40d570175804ffe0328396f03 Mon Sep 17 00:00:00 2001
From 0bec91079152ba03d58fe8657154bd45875acdfa Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Fri, 27 Oct 2023 10:57:00 +0300
Date: Fri, 3 Nov 2023 16:24:15 +0300
Subject: [PATCH 14/14] Make branding free Russian translation
---
po/ru.po | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
po/ru.po | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/po/ru.po b/po/ru.po
index 9a2066f..0bb317f 100644
index 97093b4..1fc0202 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2004,7 +2004,7 @@ msgid ""
"You haven't created any mount points for your %(product)s %(version)s "
"installation yet. You can:"
@@ -466,7 +466,7 @@ msgid ""
"https://msvsphere-os.ru."
msgstr ""
-"Вы еще не создали точки монтирования для установки МСВСфера %(version)s ОС. "
+"Вы еще не создали точки монтирования для установки системы. "
"Вы можете:"
"Это аппаратное обеспечение (или их комбинация) не поддерживается "
-"МСВСфера ОС. Для получения дополнительной информации о поддерживаемом "
+"операционной системой. Для получения дополнительной информации о поддерживаемом "
"оборудовании см. https://msvsphere-os.ru."
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
@@ -2088,7 +2088,7 @@ msgid ""
"of available space, including <b>%(software)s</b> for software and <b>"
"%(swap)s</b> for swap space."
#: pyanaconda/core/constants.py:163
@@ -1864,7 +1864,7 @@ msgid ""
"you'll be able to view their details here."
msgstr ""
-"Для установки <b>МСВСфера ОС</b> требуется <b>%(total)s</b>, в том числе <b>"
+"Для установки <b>операционной системы</b> требуется <b>%(total)s</b>, в том числе <b>"
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
"Здесь будет показана информация о созданных точках монтирования для "
-"установки МСВСфера %(version)s OC."
+"установки операционной системы."
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
@@ -1961,7 +1961,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
@@ -2098,8 +2098,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."
@@ -1971,8 +1971,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> пространства, в том числе <b>"
+"Для <a href=\"\" title=\"%(tooltip)s\">установки <b>"
+"операционной системы</b></a> требуется <b>%(total)s</b> пространства, в том числе <b>"
"%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
-"Для <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
@@ -2114,7 +2114,7 @@ msgid ""
@@ -1987,7 +1987,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 ""
@ -49,7 +58,7 @@ index 9a2066f..0bb317f 100644
"существующие разделы с помощью помощника или самостоятельно выбрать размеры "
"разделов в окне настройки разделов."
@@ -2124,7 +2124,7 @@ msgid ""
@@ -1997,7 +1997,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 ""
@ -58,22 +67,34 @@ index 9a2066f..0bb317f 100644
"использовать все свободное место на выбранных дисках."
#: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178
@@ -2135,10 +2135,10 @@ msgid ""
@@ -2008,10 +2008,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/detailederror.py:48
@@ -2339,8 +2339,8 @@ msgid ""
"%(name)s is now successfully installed and ready for you to use!\n"
#: pyanaconda/ui/gui/spokes/lib/network_secret_agent.py:180
@@ -2071,7 +2071,7 @@ msgid ""
"You haven't created any mount points for your %(product)s %(version)s "
"installation yet. You can:"
msgstr ""
-"Вы еще не создали точки монтирования для установки МСВСфера %(version)s OC. "
+"Вы еще не создали точки монтирования для установки операционной системы. "
"Вы можете:"
#: pyanaconda/ui/gui/spokes/lib/accordion.py:479
@@ -2401,20 +2401,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"
@ -83,8 +104,9 @@ index 9a2066f..0bb317f 100644
#: pyanaconda/ui/gui/spokes/installation_progress.py:163
#, python-format
@@ -2348,8 +2348,8 @@ msgid ""
"%(name)s is now successfully installed and ready for you to use!\n"
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"
@ -92,35 +114,17 @@ index 9a2066f..0bb317f 100644
+"Операционная система установлена и готова к работе.\n"
+"Необходимо выйти из приложения, чтобы приступить к использованию."
#: pyanaconda/ui/gui/spokes/software_selection.py:66
msgctxt "GUI|Spoke"
@@ -2512,7 +2512,7 @@ msgid ""
"you'll be able to view their details here."
msgstr ""
"Здесь будет показана информация о созданных точках монтирования для "
-"установки МСВСфера %(version)s ОС."
+"установки системы."
#: pyanaconda/ui/gui/spokes/custom_storage.py:615
#: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
@@ -2932,7 +2932,7 @@ msgid ""
#: pyanaconda/ui/gui/__init__.py:365 widgets/src/BaseWindow.c:151
msgid "Help!"
@@ -3486,7 +3486,7 @@ msgid ""
"recommended for a normal %(productName)s install."
msgstr ""
"Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
-"размера для обычной установки МСВСфера ОС."
+"размера для обычной установки системы."
+"размера для обычной установки операционной системы."
#: pyanaconda/modules/storage/checker/utils.py:131
#, python-format
@@ -4028,7 +4028,7 @@ msgid ""
"https://msvsphere-os.ru."
msgstr ""
"Это аппаратное обеспечение (или их комбинация) не поддерживается "
-"МСВСфера ОС. Для получения дополнительной информации о поддерживаемом "
+"системой. Для получения дополнительной информации о поддерживаемом "
"оборудовании см. https://msvsphere-os.ru."
#: pyanaconda/core/constants.py:165
--
2.41.0

98
SOURCES/0015-Disable-sphere-url.patch
Unescape View File

@ -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

226
SPECS/anaconda.spec
Unescape View File

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 34.25.2.10
Release: 1%{?dist}.inferit.15
Version: 34.25.3.8
Release: 1%{?dist}.inferit.12
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -27,6 +27,7 @@ Patch1011: 0011-Add-MSVSphere-identification-support.patch
Patch1012: 0012-Enable-administrator-by-default.patch
Patch1013: 0013-Fix-smt-url.patch
Patch1014: 0014-Make-branding-free-Russian-translation.patch
Patch1015: 0015-Disable-sphere-url.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -51,7 +52,7 @@ Patch1014: 0014-Make-branding-free-Russian-translation.patch
%define libxklavierver 5.4
%define mehver 0.23-1
%define nmver 1.0
%define pykickstartver 3.32.9-1
%define pykickstartver 3.32.10-1
%define pypartedver 2.5-2
%define pythonblivetver 1:3.6.0-4
%define rpmver 4.10.0
@ -241,8 +242,6 @@ Requires: rsync
# only WeakRequires elsewhere and not guaranteed to be present
Requires: device-mapper-multipath
Requires: zram-generator
# Submitting bugs to bugzilla
# Requires: libreport-rhel-anaconda-bugzilla
# External tooling for managing NVMe-FC devices in the installation environment
Requires: nvme-cli
@ -432,79 +431,196 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Mon Feb 05 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.2.10-1.inferit.15
* Mon Feb 05 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.12
- INF-1026: Added Version to Live Welcome alert
* Mon Oct 30 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.2.10-1.inferit.14
- Update Russian translation
* Mon Dec 25 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.11
- Disable sphere url
* Sat Oct 28 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.2.10-1.inferit.13
- Update Russian translation
* Tue Nov 14 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.10
- Fix smt translation
* Fri Oct 27 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.2.10-1.inferit.12
- Parse VERSION, not PRETTY_NAME
* Tue Nov 7 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.9
- Change smt url
* Fri Oct 27 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.2.10-1.inferit.11
- Drop some brandiong entries from Russian translation
* Tue Nov 7 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.8
- Fix translation on final screen
* Thu Sep 14 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 34.25.2.10-1.inferit.10
- Fix translations
* Sat Nov 4 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.7
- Update Russian translation
* Wed Sep 13 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 34.25.2.10-1.inferit.9
- Fix smt url
* Fri Nov 3 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.6
- Apply Transaltion changes
* Wed Sep 13 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 34.25.2.10-1.inferit.8
- Change urls from msvsphere.ru to msvsphere-os.ru
* Tue Oct 24 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 34.25.3.8-1.inferit.5
- Updated Russian translation for checkbox label "Encrypt my data"
* Mon Aug 21 2023 Arkady L. Shane <ashejn@msvsphere> - 34.25.2.10-1.inferit.7
- Added more products
* Mon Oct 23 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.4
- Fix Russian Translation
* Mon Aug 7 2023 Arkady L. Shane <ashejn@msvsphere> - 34.25.2.10-1.inferit.6
- Remove dot in translations
* Mon Oct 23 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.3
- Update Russian translation
* Wed Aug 2 2023 Arkady L. Shane <ashejn@msvsphere> - 34.25.2.10-1.inferit.5
- Enable checkbox to allow admin rules for new user
* Mon Oct 23 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 34.25.3.8-1.inferit.2
- Fixed MSVSphere de-branding and identity support errors.
- Rebuilt for MSVSphere 8.8
* Tue Aug 1 2023 Arkady L. Shane <ashejn@msvsphere> - 34.25.2.10-1.inferit.4
- Update condition for Live and Compose
* Sun Oct 22 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.3.8-1.inferit.1
- Drop R: libreport-rhel-anaconda-bugzilla
* Sat Jul 29 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.2.10-1.inferit.3
* Wed Oct 04 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 34.25.3.8-1.inferit
- Fix translations
- Fix smt url
- Added MSVSphere ARM and Server identification support patch
- Improved Russian translation
* Sat Jul 8 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 34.25.2.10-1.inferit.2
- Added Server repository support
* Sun Jun 25 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 34.25.2.10-1.inferit.1
- Replace Fedora with MSVSphere in po translations
* Thu May 18 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 34.25.2.10-1.inferit
- Update Russian translation
- Rebuilt for MSVSphere 9.2
* Wed Apr 19 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.5
* Set English as fallback language for anaconda help
* Mon Apr 17 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.4
- Set English as fallback language for anaconda help
- Set Russian as default language for new regions
- Updated Russian translation patch
* Sun Apr 16 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.3
- Updated Russian translation patch
* Fri Apr 14 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.2
- Set default language to ru_RU.UTF-8
- Translated distribution name in Russian translation
* Mon Apr 03 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit.1
- Set default time zone to Europe/Moscow
* Thu Mar 30 2023 Eugene Zamriy <ezamriy@msvsphere.ru> - 34.25.1.14-1.inferit
- Added MSVSphere product config
- Added Minimal repository support
- Adjusted installer background colors
- Hide CDN button
- Rebuilt for MSVSphere 9.1
- Disabled RHEL subscription
- Rebuilt for MSVSphere 9.3
* Wed Aug 09 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.3.8-1
- iscsi: Allow changing iSCSI initiator name once set (vtrefny)
Resolves: rhbz#2223977
- Missing translation for button labels in Beta dialog
Resolves: rhbz#2225450
* Wed Jul 12 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.3.7-1
- Allow showing passphrase when unlocking LUKS device (jstodola)
Resolves: rhbz#2013190
- Be more indulgent when reclaiming disk space (jstodola)
Resolves: rhbz#2187371
- Do not print error on inst.ks=cdrom|hd (jkonecny)
Resolves: rhbz#2077045
* Fri Jun 30 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.3.6-1
- Remove unused variable in TUI software selection (ozobal)
Related: rhbz#2214266
Related: rhbz#2164819
- Fix aarch64 architecture detection (jstodola)
Resolves: rhbz#2164819
* Mon Jun 26 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.3.5-1
- Add option for installing RedHat kernel (ozobal)
Related: rhbz#2164819
Resolves: rhbz#2214266
- Add TUI for installing non-standard kernels (ozobal)
Resolves: rhbz#2214266
Resolves: rhbz#2164819
- Add GUI option for installing 64k ARM kernel (ozobal)
Resolves: rhbz#2214266
Resolves: rhbz#2164819
- Add match_available_packages to dnf_manager (ozobal)
Related: rhbz#2214266
Related: rhbz#2164819
* Tue Jun 20 2023 Jiri Konecny <jkonecny@redhat.com> - 34.25.3.4-1
- Warn about deprecated inst.geoloc=provider_... (vslavik)
Resolves: rhbz#2127473
- Improve doc strings for geolocation (vslavik)
Related: rhbz#2127473
- Do not run geolocation for TUI (vslavik)
Resolves: rhbz#2127473
- gui: Simplify invalid timezone handling. (vslavik)
Related: rhbz#2127473
- Try to set timezone from language on welcome spoke (vslavik)
Resolves: rhbz#2127473
- Always set timezone with priority (vslavik)
Resolves: rhbz#2127473
- Add timezone priority to module backend and interface (vslavik)
Resolves: rhbz#2127473
- Use existing locale in welcome spoke (vslavik)
Resolves: rhbz#2127473
- Apply geolocation in main process (vslavik)
Related: rhbz#2127473
- Add back waiting for geolocation (vslavik)
Related: rhbz#2127473
- Add wait_for_task() to wait for a Task with timeout (vslavik)
Related: rhbz#2127473
- Don't fall back to default timezone in welcome spoke (vslavik)
Related: rhbz#2127473
- Use directly URLs in conf geoloc provider field (vslavik)
Related: rhbz#2127473
- Remove unmodularized geolocation (vslavik)
Related: rhbz#2127473
- Use modularized geolocation instead of unmodularized (vslavik)
Related: rhbz#2127473
- Hide the geolocation task in Timezone's interface (vslavik)
Related: rhbz#2127473
- Add GeolocationTask to the Timezone module (vslavik)
Related: rhbz#2127473
- Add a D-Bus structure for geolocation data (vslavik)
Related: rhbz#2127473
- Add conf option for geolocation provider (vslavik)
Related: rhbz#2127473
- Retranslate welcome screen more simply (vslavik)
Related: rhbz#2127473
- Fix translations of the pre-release warning dialog (vponcova)
Resolves: rhbz#2165762
Related: rhbz#2127473
- Split Timezone module tests for tasks to new file (vslavik)
Related: rhbz#2127473
- Make check for geolocation start a standalone helper (vslavik)
Related: rhbz#2127473
- Keep Timezone proxy in Welcome spoke (vslavik)
Related: rhbz#2127473
- Split starting locales in welcome spoke to a helper (vslavik)
Related: rhbz#2127473
- Rename constant to reflect its usage (vslavik)
Related: rhbz#2127473
- Fix "proxy" boot option is printing inst. warning (jkonecny)
Related: rhbz#2177219
- Allow showing proxy passwords on the installation source spoke (jstodola)
Resolves: rhbz#2013190
- Allow showing passwords on the subscription spoke (jstodola)
Resolves: rhbz#2013190
- Always hide the user password by default (jstodola)
Related: rhbz#2013190
- Always hide the root password by default (jstodola)
Related: rhbz#2013190
* Mon Jun 12 2023 Vladimír Slávik <vslavik@redhat.com> - 34.25.3.3-1
- Stop infinite wait for CDROM when KS is processed (jkonecny)
Resolves: rhbz#2209599
- Apply --noverifyssl option for liveimg kickstart command (jstodola)
Resolves: rhbz#2157921
* Mon Jun 05 2023 Vladimír Slávik <vslavik@redhat.com> - 34.25.3.2-1
- Fix kickstart proxy cmd in stage1 (jkonecny)
Resolves: rhbz#2177219
- Check minimal LUKS passphrase length in FIPS mode for Kickstart (vslavik)
Resolves: rhbz#2163497
- GUI: Require 8 chars of LUKS passwords in FIPS mode (vslavik)
Resolves: rhbz#2163497
- Use inst.proxy in stage1 (jkonecny)
Resolves: rhbz#2177219
- Change driver_updates exit info messages to debug (jkonecny)
Related: rhbz#2154906
* Thu May 11 2023 Radek Vykydal <rvykydal@redhat.com> - 34.25.3.1-1
- Add DNS search and ignore options from kickstart (vslavik)
Resolves: rhbz#2065754
- driver_updates: migrate driver_updates.py to pep8 format (jkonecny)
Related: rhbz#2154906
- driver_updates: adding tests for the new logging solution (jkonecny)
Related: rhbz#2154906
- driver_updates: add lot of debug logs for easier debugging (jkonecny)
Related: rhbz#2154906
- driver_updates: extend where we print log messages (jkonecny)
Resolves: rhbz#2154906
- Add missing documentation about OEMDRV (jkonecny)
Related: rhbz#2171811
- oemdrv: wait up to 5 seconds for disks to be handled (rmetrich)
Resolves: rhbz#2171811
* Thu Apr 13 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 34.25.2.10-1
- Rebuilt for MSVSphere 9.2 beta
* Wed Mar 22 2023 Martin Kolman <mkolman@redhat.com> - 34.25.2.10-1
- Update translations

Write Preview
Loading…
Cancel
Save