Implement show EULA before installation

4 changed files with 74 additions and 133 deletions
--- a/SOURCES/0004-Add-Minimal-and-Server-repository-support.patch
+++ b/SOURCES/0004-Add-Minimal-and-Server-repository-support.patch
@ -1,28 +1,27 @@
-From 0d80cd00f38b0d8be0070b8db92066e070687528 Mon Sep 17 00:00:00 2001
+From 18fcf71d53a8c476c55076f8a0e8db0904a51670 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 4/4] Add Minimal and Server repository support
+Subject: [PATCH 04/15] Add Minimal and Server repository support
 ---
- pyanaconda/core/constants.py | 5 ++++-
+ pyanaconda/core/constants.py | 4 +++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
-index 1496f8c..e8c79b8 100644
+index 1496f8c..72a9d39 100644
 --- a/pyanaconda/core/constants.py
 +++ b/pyanaconda/core/constants.py
-@@ -58,7 +58,10 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(),
+@@ -58,7 +58,9 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(),
                  "fedora-modular-server",
                  "rawhide",
                  "BaseOS",  # Used by RHEL
 -                 "baseos"]  # Used by CentOS Stream
 +                 "baseos",  # Used by CentOS Stream
 +                 "Server",  # Used by MSVSphere
 +                 "Certified",  # Used by MSVSphere Certified
 +                 "Minimal"] # Used by MSVSphere
 DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS"
 -- 
-2.46.0
+2.44.0
--- a/SOURCES/0011-Add-MSVSphere-identification-support.patch
+++ b/SOURCES/0011-Add-MSVSphere-identification-support.patch
@ -1,19 +1,19 @@
-From ddec23a420f03e2519bba9b0aba24b401ee0c409 Mon Sep 17 00:00:00 2001
+From b0fe2c954cbab7d9e963a71efa6be2e9b310ab3d Mon Sep 17 00:00:00 2001
 From: tigro <tigro@msvsphere-os.ru>
 Date: Wed, 3 Apr 2024 10:11:15 +0300
-Subject: [PATCH 11/11] Add MSVSphere identification support
+Subject: [PATCH] Add MSVSphere identification support
 ---
 data/liveinst/gnome/fedora-welcome.desktop    |   4 +-
 data/liveinst/gnome/fedora-welcome.js         |   2 +-
- po/ru.po                                      | 238 ++++++++++++++----
+ po/ru.po                                      | 216 ++++++++++++++----
- pyanaconda/product.py                         |  40 ++-
+ 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           |  23 +-
+ pyanaconda/ui/gui/spokes/welcome.py           |  21 +-
- pyanaconda/vnc.py                             |  47 +++-
+ pyanaconda/vnc.py                             |  42 +++-
- 9 files changed, 305 insertions(+), 63 deletions(-)
+ 9 files changed, 273 insertions(+), 62 deletions(-)
 diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
 index 90f5678..8ca72a7 100644
@ -29,7 +29,7 @@ index 90f5678..8ca72a7 100644
 Terminal=false
 Type=Application
 diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js
-index 4c0a66a..0a494c8 100755
+index 4c0a66a..e313403 100755
 --- a/data/liveinst/gnome/fedora-welcome.js
 +++ b/data/liveinst/gnome/fedora-welcome.js
@@ -62,7 +62,7 @@ const WelcomeWindow = new Lang.Class({
@ -42,10 +42,10 @@ index 4c0a66a..0a494c8 100755
       this.window.connect('key-press-event', Lang.bind(this,
           function(w, event) {
 diff --git a/po/ru.po b/po/ru.po
-index 1edb03d..4742180 100644
+index 1edb03d..1f8915b 100644
 --- a/po/ru.po
 +++ b/po/ru.po
-@@ -197,7 +197,42 @@ msgstr "Выбор корня"
+@@ -197,7 +197,37 @@ msgstr "Выбор корня"
 msgid "The following installations were discovered on your system."
 msgstr "В вашей системе обнаружены следующие установки."
@ -57,39 +57,34 @@ index 1edb03d..4742180 100644
 +
 +#: pyanaconda/product.py:85
 +#, python-format
 +msgid "MSVSphere %(productVersion)s Certified INSTALLATION"
 +msgstr "УСТАНОВКА МСВСфера %(productVersion)s Сертифицированная"
 +
 +#: pyanaconda/product.py:87
 +#, python-format
 +msgid "MSVSphere %(productVersion)s ARM INSTALLATION"
 +msgstr "УСТАНОВКА МСВСфера %(productVersion)s АРМ"
 +
-+#: pyanaconda/product.py:89
+#: pyanaconda/product.py:87
 +#, python-format
 +msgid "MSVSphere %(productVersion)s Cinnamon INSTALLATION"
 +msgstr "УСТАНОВКА МСВСфера %(productVersion)s Cinnamon"
 +
-+#: pyanaconda/product.py:91
+#: pyanaconda/product.py:89
 +#, python-format
 +msgid "MSVSphere %(productVersion)s KDE INSTALLATION"
 +msgstr "УСТАНОВКА МСВСфера %(productVersion)s KDE"
 +
-+#: pyanaconda/product.py:93
+#: pyanaconda/product.py:91
 +#, python-format
 +msgid "MSVSphere %(productVersion)s XFCE INSTALLATION"
 +msgstr "УСТАНОВКА МСВСфера %(productVersion)s XFCE"
 +
-+#: pyanaconda/product.py:95
+#: pyanaconda/product.py:93
 +#, python-format
 +msgid "MSVSphere %(productVersion)s OS INSTALLATION"
 +msgstr "УСТАНОВКА МСВСфера %(productVersion)s ОС"
 +
-+#: pyanaconda/product.py:97
+#: pyanaconda/product.py:95
 #, python-format
 msgid "%(productName)s %(productVersion)s INSTALLATION"
 msgstr "УСТАНОВКА %(productName)s %(productVersion)s"
-@@ -288,31 +323,101 @@ msgstr "Сервера NTP:"
+@@ -288,31 +318,91 @@ msgstr "Сервера NTP:"
 msgid "not configured"
 msgstr "не настроено"
@ -101,76 +96,66 @@ index 1edb03d..4742180 100644
 +
 +#: pyanaconda/vnc.py:83
 +#, python-format
 +msgid "MSVSphere %(productVersion)s Certified installation"
 +msgstr "Установка МСВСфера %(productVersion)s Сертифицированная"
 +
 +#: pyanaconda/vnc.py:85
 +#, python-format
 +msgid "MSVSphere %(productVersion)s ARM installation"
 +msgstr "Установка МСВСфера %(productVersion)s АРМ"
 +
-+#: pyanaconda/vnc.py:87
+#: pyanaconda/vnc.py:85
 +#, python-format
 +msgid "MSVSphere %(productVersion)s Cinnamon installation"
 +msgstr "Установка МСВСфера %(productVersion)s Cinnamon"
 +
-+#: pyanaconda/vnc.py:89
+#: pyanaconda/vnc.py:87
 +#, python-format
 +msgid "MSVSphere %(productVersion)s KDE installation"
 +msgstr "Установка МСВСфера %(productVersion)s KDE"
 +
-+#: pyanaconda/vnc.py:91
+#: pyanaconda/vnc.py:89
 +#, python-format
 +msgid "MSVSphere %(productVersion)s XFCE installation"
 +msgstr "Установка МСВСфера %(productVersion)s XFCE"
 +
-+#: pyanaconda/vnc.py:93
+#: pyanaconda/vnc.py:91
 +#, python-format
 +msgid "MSVSphere %(productVersion)s OS installation"
 +msgstr "Установка МСВСфера %(productVersion)s ОС"
 +
-+#: pyanaconda/vnc.py:95
+#: pyanaconda/vnc.py:93
 #, python-format
 msgid "%(productName)s %(productVersion)s installation"
 msgstr "Установка %(productName)s %(productVersion)s"
 -#: pyanaconda/vnc.py:148
-+#: pyanaconda/vnc.py:167
+#: pyanaconda/vnc.py:159
 +#, python-format
 +msgid "MSVSphere %(productVersion)s Server installation on host %(name)s"
 +msgstr "Установка МСВСфера %(productVersion)s Сервер на %(name)s"
 +
-+#: pyanaconda/vnc.py:170
+#: pyanaconda/vnc.py:162
 +#, python-format
 +msgid "MSVSphere %(productVersion)s Certified installation on host %(name)s"
 +msgstr "Установка МСВСфера %(productVersion)s Сертифицированная на %(name)s"
 +
 +#: pyanaconda/vnc.py:173
 +#, python-format
 +msgid "MSVSphere %(productVersion)s ARM installation on host %(name)s"
 +msgstr "Установка МСВСфера %(productVersion)s АРМ на %(name)s"
 +
-+#: pyanaconda/vnc.py:176
+#: pyanaconda/vnc.py:162
 +#, python-format
 +msgid "MSVSphere %(productVersion)s Cinnamon installation on host %(name)s"
 +msgstr "Установка МСВСфера %(productVersion)s Cinnamon на %(name)s"
 +
-+#: pyanaconda/vnc.py:179
+#: pyanaconda/vnc.py:162
 +#, python-format
 +msgid "MSVSphere %(productVersion)s KDE installation on host %(name)s"
 +msgstr "Установка МСВСфера %(productVersion)s KDE на %(name)s"
 +
-+#: pyanaconda/vnc.py:182
+#: pyanaconda/vnc.py:162
 +#, python-format
 +msgid "MSVSphere %(productVersion)s XFCE installation on host %(name)s"
 +msgstr "Установка МСВСфера %(productVersion)s XFCE на %(name)s"
 +
-+#: pyanaconda/vnc.py:185
+#: pyanaconda/vnc.py:165
 +#, python-format
 +msgid "MSVSphere %(productVersion)s OS installation on host %(name)s"
 +msgstr "Установка МСВСфера %(productVersion)s ОС на %(name)s"
 +
-+#: pyanaconda/vnc.py:188
+#: pyanaconda/vnc.py:168
 #, python-format
 msgid "%(productName)s %(productVersion)s installation on host %(name)s"
 msgstr "Установка %(productName)s %(productVersion)s на %(name)s"
@ -197,7 +182,7 @@ index 1edb03d..4742180 100644
 #, python-format
 msgid "Giving up attempting to connect after %d try!\n"
 msgid_plural "Giving up attempting to connect after %d tries!\n"
-@@ -320,16 +425,16 @@ msgstr[0] "Установка соединения прекращена посл
+@@ -320,16 +410,16 @@ msgstr[0] "Установка соединения прекращена посл
 msgstr[1] "Установка соединения прекращена после %d попыток!\n"
 msgstr[2] "Установка соединения прекращена после %d попыток!\n"
@ -217,7 +202,7 @@ index 1edb03d..4742180 100644
 #, python-format
 msgid ""
 "Please manually connect your vnc client to IP-ADDRESS:%s to begin the "
-@@ -340,15 +445,15 @@ msgstr ""
+@@ -340,15 +430,15 @@ msgstr ""
 "Переключитесь на оболочку (Ctrl-B 2) и выполните команду 'ip addr', чтобы "
 "найти IP-ADDRESS."
@ -236,7 +221,7 @@ index 1edb03d..4742180 100644
 msgid ""
 "\n"
 "\n"
-@@ -366,7 +471,7 @@ msgstr ""
+@@ -366,7 +456,7 @@ msgstr ""
 "\n"
 "\n"
@ -245,7 +230,7 @@ index 1edb03d..4742180 100644
 msgid ""
 "\n"
 "\n"
-@@ -382,7 +487,7 @@ msgstr ""
+@@ -382,7 +472,7 @@ msgstr ""
 "для ограничения доступа к серверу.\n"
 "\n"
@ -254,7 +239,7 @@ index 1edb03d..4742180 100644
 msgid ""
 "\n"
 "\n"
-@@ -394,7 +499,7 @@ msgstr ""
+@@ -394,7 +484,7 @@ msgstr ""
 "Вы выбрали запуск VNC с паролем.\n"
 "\n"
@ -263,7 +248,7 @@ index 1edb03d..4742180 100644
 msgid ""
 "\n"
 "\n"
-@@ -406,7 +511,7 @@ msgstr ""
+@@ -406,7 +496,7 @@ msgstr ""
 "Неизвестная ошибка. Остановка работы.\n"
 "\n"
@ -272,7 +257,7 @@ index 1edb03d..4742180 100644
 msgid ""
 "VNC password must be six to eight characters long.\n"
 "Please enter a new one, or leave blank for no password."
-@@ -750,13 +855,13 @@ msgstr ""
+@@ -750,13 +840,13 @@ msgstr ""
 #: pyanaconda/core/constants.py:157
 msgid ""
@ -292,7 +277,7 @@ index 1edb03d..4742180 100644
 #: pyanaconda/core/constants.py:163
 msgid ""
-@@ -1507,7 +1612,7 @@ msgstr "Не удалось добавить устройство."
+@@ -1507,7 +1597,7 @@ msgstr "Не удалось добавить устройство."
 #: pyanaconda/modules/storage/partitioning/interactive/utils.py:213
 #, python-brace-format
 msgid "New {name} {version} Installation"
@ -301,7 +286,7 @@ index 1edb03d..4742180 100644
 #: pyanaconda/modules/storage/partitioning/interactive/utils.py:275
 msgid "Cannot set label on file system."
-@@ -1937,7 +2042,7 @@ msgid ""
+@@ -1937,7 +2027,7 @@ msgid ""
 "recommended for a normal %(productName)s install."
 msgstr ""
 "Размер раздела %(mount)s меньше %(size)s, что меньше рекомендованного "
@ -310,7 +295,7 @@ index 1edb03d..4742180 100644
 #: pyanaconda/modules/storage/checker/utils.py:131
 #, python-format
-@@ -3455,7 +3560,7 @@ msgid ""
+@@ -3455,7 +3545,7 @@ msgid ""
 "You haven't created any mount points for your %(product)s %(version)s "
 "installation yet.  You can:"
 msgstr ""
@ -319,7 +304,7 @@ index 1edb03d..4742180 100644
 "Вы можете:"
 #: pyanaconda/ui/gui/spokes/lib/accordion.py:479
-@@ -3487,6 +3592,10 @@ msgstr ""
+@@ -3487,6 +3577,10 @@ msgstr ""
 "_Автоматически созданные точки монтирования могут быть зашифрованы по "
 "умолчанию:"
@ -330,7 +315,7 @@ index 1edb03d..4742180 100644
 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:69
 msgid "Please wait... software metadata still loading."
 msgstr "Подождите… Всё ещё загружаются метаданные ПО."
-@@ -3498,7 +3607,7 @@ msgid ""
+@@ -3498,7 +3592,7 @@ msgid ""
 "of available space, including <b>%(software)s</b> for software and "
 "<b>%(swap)s</b> for swap space."
 msgstr ""
@ -339,7 +324,7 @@ index 1edb03d..4742180 100644
 "<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:81
-@@ -3509,7 +3618,7 @@ msgid ""
+@@ -3509,7 +3603,7 @@ msgid ""
 "<b>%(software)s</b> for software and <b>%(swap)s</b> for swap space."
 msgstr ""
 "Для <a href=\"\" title=\"%(tooltip)s\">программного обеспечения "
@ -348,7 +333,7 @@ index 1edb03d..4742180 100644
 "<b>%(software)s</b> для программ и <b>%(swap)s</b> для подкачки."
 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:132
-@@ -3520,11 +3629,11 @@ msgstr "%s На выбранных дисках доступно:"
+@@ -3520,11 +3614,11 @@ msgstr "%s На выбранных дисках доступно:"
 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:142
 #, python-format
 msgid ""
@ -362,7 +347,7 @@ index 1edb03d..4742180 100644
 "существующие разделы с помощью помощника или самостоятельно выбрать размеры "
 "разделов в окне настройки разделов."
-@@ -3534,7 +3643,7 @@ msgid ""
+@@ -3534,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 ""
@ -371,7 +356,7 @@ index 1edb03d..4742180 100644
 "использовать все свободное место на выбранных дисках."
 #: pyanaconda/ui/gui/spokes/lib/storage_dialogs.py:178
-@@ -3545,10 +3654,10 @@ msgid ""
+@@ -3545,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 ""
@ -384,7 +369,7 @@ index 1edb03d..4742180 100644
 "покинуть программу установки."
 #: pyanaconda/ui/gui/spokes/lib/subscription.py:66
-@@ -4096,7 +4205,7 @@ msgid ""
+@@ -4096,7 +4190,7 @@ msgid ""
 "you'll be able to view their details here."
 msgstr ""
 "Здесь будет показана информация о созданных точках монтирования для "
@ -393,51 +378,44 @@ index 1edb03d..4742180 100644
 #: pyanaconda/ui/gui/spokes/custom_storage.py:615
 #: pyanaconda/ui/gui/spokes/advstorage/nvdimm.glade:178
-@@ -4431,7 +4540,42 @@ msgstr "Рабочий сервер NTP не настроен"
+@@ -4431,6 +4525,36 @@ msgstr "Рабочий сервер NTP не настроен"
 msgid "What language would you like to use during the installation process?"
 msgstr "Какой язык вы хотите использовать в процессе установки?"
-#: pyanaconda/ui/gui/spokes/welcome.py:209
+#: pyanaconda/ui/gui/spokes/welcome.py:278
 +#: pyanaconda/ui/gui/spokes/welcome.py:213
 +#, python-format
 +msgid "WELCOME TO MSVSphere %(version)s Server"
 +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сервер"
 +
-+#: pyanaconda/ui/gui/spokes/welcome.py:215
+#: pyanaconda/ui/gui/spokes/welcome.py:280
 +#, python-format
 +msgid "WELCOME TO MSVSphere %(version)s Certified"
 +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Сертифицированная"
 +
 +#: pyanaconda/ui/gui/spokes/welcome.py:217
 +#, python-format
 +msgid "WELCOME TO MSVSphere %(version)s ARM"
 +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s АРМ"
 +
-+#: pyanaconda/ui/gui/spokes/welcome.py:219
+#: pyanaconda/ui/gui/spokes/welcome.py:282
 +#, python-format
 +msgid "WELCOME TO MSVSphere %(version)s Cinnamon"
 +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s Cinnamon"
 +
-+#: pyanaconda/ui/gui/spokes/welcome.py:221
+#: pyanaconda/ui/gui/spokes/welcome.py:284
 +#, python-format
 +msgid "WELCOME TO MSVSphere %(version)s KDE"
 +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s KDE"
 +
-+#: pyanaconda/ui/gui/spokes/welcome.py:223
+#: pyanaconda/ui/gui/spokes/welcome.py:286
 +#, python-format
 +msgid "WELCOME TO MSVSphere %(version)s XFCE"
 +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s XFCE"
 +
-+#: pyanaconda/ui/gui/spokes/welcome.py:225
+#: pyanaconda/ui/gui/spokes/welcome.py:288
 +#, python-format
 +msgid "WELCOME TO MSVSphere %(version)s OS"
 +msgstr "ДОБРО ПОЖАЛОВАТЬ В МСВСфера %(version)s ОС"
 +
-+#: pyanaconda/ui/gui/spokes/welcome.py:227
+ #: pyanaconda/ui/gui/spokes/welcome.py:209
 #, python-format
 msgid "WELCOME TO %(name)s %(version)s."
- msgstr "ДОБРО ПОЖАЛОВАТЬ В %(name)s %(version)s."
+@@ -4482,8 +4606,8 @@ msgid ""
@@ -4482,8 +4626,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 ""
@ -448,7 +426,7 @@ index 1edb03d..4742180 100644
 #: pyanaconda/ui/gui/spokes/installation_progress.py:163
 #, python-format
-@@ -4491,8 +4635,8 @@ msgid ""
+@@ -4491,8 +4615,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 ""
@ -459,7 +437,7 @@ index 1edb03d..4742180 100644
 #: pyanaconda/ui/gui/spokes/installation_source.py:73
 msgid "Setting up installation source..."
-@@ -7614,21 +7758,21 @@ msgstr "Настройка Liveinst"
+@@ -7614,21 +7738,21 @@ msgstr "Настройка Liveinst"
 #: data/liveinst/gnome/fedora-welcome.desktop:3
 #: data/liveinst/gnome/fedora-welcome.js:65
@ -490,7 +468,7 @@ index 1edb03d..4742180 100644
 #: data/liveinst/gnome/fedora-welcome.js:130
 diff --git a/pyanaconda/product.py b/pyanaconda/product.py
-index 9dbfe1f..3a9998c 100644
+index 9dbfe1f..140dbee 100644
 --- a/pyanaconda/product.py
 +++ b/pyanaconda/product.py
@@ -19,6 +19,7 @@
@ -501,7 +479,7 @@ index 9dbfe1f..3a9998c 100644
 from pyanaconda.core.i18n import _
-@@ -64,9 +65,46 @@ def trim_product_version_for_ui(version):
+@@ -64,9 +65,42 @@ def trim_product_version_for_ui(version):
 productVersion = trim_product_version_for_ui(productVersion)
@ -510,8 +488,6 @@ index 9dbfe1f..3a9998c 100644
 +    if productName == "MSVSphere Server" or \
 +            (productName == "MSVSphere" and productVariant == "Minimal"):
 +        productFlavor = "Server"
 +    elif productName == "MSVSphere" and productVariant == "Certified":
 +        productFlavor = "Certified"
 +    elif productName == "MSVSphere" and productVariant == "BaseOS":
 +        productFlavor = "OS"
 +    elif productName == "MSVSphere":
@ -531,8 +507,6 @@ index 9dbfe1f..3a9998c 100644
 -    return _("%(productName)s %(productVersion)s INSTALLATION") % {
 +    if productBase == "MSVSphere" and productFlavor == "Server":
 +        distro_text = _("MSVSphere %(productVersion)s Server INSTALLATION")
 +    elif productBase == "MSVSphere" and productFlavor == "Certified":
 +        distro_text = _("MSVSphere %(productVersion)s Certified INSTALLATION")
 +    elif productBase == "MSVSphere" and productFlavor == "ARM":
 +        distro_text = _("MSVSphere %(productVersion)s ARM INSTALLATION")
 +    elif productBase == "MSVSphere" and productFlavor == "Cinnamon":
@ -603,7 +577,7 @@ 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 de71615..a0718bb 100644
+index de71615..7937f2c 100644
 --- a/pyanaconda/ui/gui/spokes/welcome.py
 +++ b/pyanaconda/ui/gui/spokes/welcome.py
@@ -35,7 +35,10 @@ from pyanaconda.ui.gui.spokes.lib.lang_locale_handler import LangLocaleHandler
@ -618,15 +592,13 @@ index de71615..a0718bb 100644
 from pyanaconda import flags
 from pyanaconda.core.i18n import _
 from pyanaconda.core.util import ipmi_abort
-@@ -206,7 +209,23 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler):
+@@ -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.") %
 +        if productBase == "MSVSphere" and productFlavor == "Server":
 +            welcome_text = _("WELCOME TO MSVSphere %(version)s Server")
 +        elif productBase == "MSVSphere" and productFlavor == "Certified":
 +            welcome_text = _("WELCOME TO MSVSphere %(version)s Certified")
 +        elif productBase == "MSVSphere" and productFlavor == "ARM":
 +            welcome_text = _("WELCOME TO MSVSphere %(version)s ARM")
 +        elif productBase == "MSVSphere" and productFlavor == "Cinnamon":
@ -644,10 +616,10 @@ index de71615..a0718bb 100644
         # Retranslate the language (filtering) entry's placeholder text
 diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
-index 5fadcde..0d0e3b7 100644
+index 5fadcde..c349de8 100644
 --- a/pyanaconda/vnc.py
 +++ b/pyanaconda/vnc.py
-@@ -76,7 +76,24 @@ class VncServer(object):
+@@ -76,7 +76,22 @@ class VncServer(object):
         self.anaconda = None
         self.log = get_stdout_logger()
@ -655,8 +627,6 @@ index 5fadcde..0d0e3b7 100644
 +        is_sphere = product.productBase == "MSVSphere"
 +        if is_sphere and product.productFlavor == "Server":
 +            desktop_text = _("MSVSphere %(productVersion)s Server installation")
 +        elif is_sphere and product.productFlavor == "Certified":
 +            desktop_text = _("MSVSphere %(productVersion)s Certified installation")
 +        elif is_sphere and product.productFlavor == "ARM":
 +            desktop_text = _("MSVSphere %(productVersion)s ARM installation")
 +        elif is_sphere and product.productFlavor == "Cinnamon":
@ -673,7 +643,7 @@ index 5fadcde..0d0e3b7 100644
                        % {'productName': product.productName,
                           'productVersion': product.productVersion}
-@@ -145,8 +162,32 @@ class VncServer(object):
+@@ -145,8 +160,29 @@ class VncServer(object):
         # figure out product info
         if host:
@ -683,9 +653,6 @@ index 5fadcde..0d0e3b7 100644
 +            if is_sphere and product.productFlavor == "Server":
 +                desktop_text = _("MSVSphere %(productVersion)s Server "
 +                                 "installation on host %(name)s")
 +            elif is_sphere and product.productFlavor == "Certified":
 +                desktop_text = _("MSVSphere %(productVersion)s Certified "
 +                                 "installation on host %(name)s")
 +            elif is_sphere and product.productFlavor == "ARM":
 +                desktop_text = _("MSVSphere %(productVersion)s ARM "
 +                                 "installation on host %(name)s")
@ -709,5 +676,5 @@ index 5fadcde..0d0e3b7 100644
                               'productVersion': product.productVersion,
                               'name': host}
 -- 
-2.46.0
+2.44.0
--- a/SOURCES/0016-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch
+++ b/SOURCES/0016-Set-LatGrkCyr-8x16-as-default-font-instead-of-eurlat.patch
@ -16,7 +16,7 @@ index 78577cb..0bd5227 100644
 DEFAULT_HELP_LANG = "en_US.UTF-8"
 -DEFAULT_VC_FONT = "eurlatgr"
-+DEFAULT_VC_FONT = "latarcyrheb-sun16"
+DEFAULT_VC_FONT = "LatGrkCyr-8x16"
 DEFAULT_KEYBOARD = "us"
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 34.25.4.9
-Release: 1%{?dist}.inferit.103.certified
+Release: 1%{?dist}.inferit.2
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@ -183,8 +183,6 @@ BuildRequires: desktop-file-utils
 Requires: anaconda-gui = %{version}-%{release}
 Requires: usermode
 Requires: zenity
 # Avoid double licensing
 Conflicts: initial-setup-gui
 %description live
 The anaconda-live package contains scripts, data and dependencies required
@ -408,11 +406,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_datadir}/applications/*.desktop
 %{_datadir}/anaconda/gnome
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_datadir}/anaconda/ui/spokes/eula.*
 %{python3_sitearch}/pyanaconda/ui/gui/spokes/eula.*
 %{python3_sitearch}/pyanaconda/ui/gui/spokes/__pycache__/eula.*
 %{python3_sitearch}/pyanaconda/ui/tui/spokes/eula.*
 %{python3_sitearch}/pyanaconda/ui/tui/spokes/__pycache__/eula.*
 %files gui
 %{python3_sitearch}/pyanaconda/ui/gui/*
@ -423,10 +416,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %exclude %{_datadir}/anaconda/ui/spokes/blivet_gui.*
 %exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/blivet_gui.*
 %endif
 # Place eula to live only
 %exclude %{_datadir}/anaconda/ui/spokes/eula.*
 %exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/eula.*
 %exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/__pycache__/eula.*
 %{_datadir}/anaconda/window-manager
 %{_datadir}/anaconda/anaconda-gtk.css
@ -434,8 +423,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{python3_sitearch}/pyanaconda/rescue.py
 %{python3_sitearch}/pyanaconda/__pycache__/rescue.*
 %{python3_sitearch}/pyanaconda/ui/tui/*
 %exclude %{python3_sitearch}/pyanaconda/ui/tui/spokes/eula.*
 %exclude %{python3_sitearch}/pyanaconda/ui/tui/spokes/__pycache__/eula.*
 %files widgets
 %{_libdir}/libAnacondaWidgets.so.*
@ -455,21 +442,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 %changelog
-* Wed Oct 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.103.certified
+* Thu Sep 26 2024 Dmitry Samoylik <Dmitriy.Samoylik@softline.com>  - 34.25.4.9-1.inferit.2
 - Place eula files only in live package to avoid license dupes in initial-setup
 * Thu Sep 26 2024 Dmitry Samoylik <Dmitriy.Samoylik@softline.com>  - 34.25.4.9-1.inferit.102.certified
 - Implement show EULA before installation
 * Sat Sep 14 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.101.certified
 - Added Certified Flavour
 * Fri Sep 13 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.100.certified
 - Bump release
 * Fri Sep 13 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.2
 - Added Certified repository support
 * Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 34.25.4.9-1.inferit.1
 - Set LatGrkCyr-8x16 as default font instead of eurlatgr