Initial MSVSphere debranding attempt

- Added MSVSphere product config
  - Disabled RHEL subscription
  - Hide CDN button
  - Adjusted installer background color
  - Added Minimal repository support
  - Replaced RHEL/Fedora mentions with MSVSphere
al changed/i9/anaconda-34.25.1.14-1.el9.inferit
Eugene Zamriy 2 years ago
parent 1e1daf4a16
commit da7df273c4
Signed by: ezamriy
GPG Key ID: 7EBF95C7DCFA496C

@ -0,0 +1,27 @@
From 73155661b46fdf9a594a81f7b17503e8556e2f6b Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 22:57:50 +0300
Subject: [PATCH 1/6] Disable subscription
---
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
--- a/pyanaconda/ui/gui/spokes/subscription.py
+++ b/pyanaconda/ui/gui/spokes/subscription.py
@@ -533,6 +533,10 @@ class SubscriptionSpoke(NormalSpoke):
# also set the spoke warning banner
self.show_warning_message(error_message)
+ @property
+ def showable(self):
+ return False
+
def initialize(self):
NormalSpoke.initialize(self)
self.initialize_start()
--
2.39.2

@ -0,0 +1,25 @@
From 25eee641eba7207fd9ea96435ed85396f5f4c23b Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 23:09:28 +0300
Subject: [PATCH 2/6] Hide CDN source button
---
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
--- 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):
self._network_button = self.builder.get_object("networkRadioButton")
self._network_box = self.builder.get_object("networkBox")
+ really_hide(self._cdn_button)
+
self._url_entry = self.builder.get_object("urlEntry")
self._protocol_combo_box = self.builder.get_object("protocolComboBox")
self._iso_chooser_button = self.builder.get_object("isoChooserButton")
--
2.39.2

@ -0,0 +1,29 @@
From 0d594c013ed36cdff18019650cb279c65f64cca2 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 23:37:33 +0300
Subject: [PATCH 3/6] Set MSVSphere installer colors
---
data/anaconda-gtk.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css
index c47bb87..c7ac84c 100644
--- a/data/anaconda-gtk.css
+++ b/data/anaconda-gtk.css
@@ -92,10 +92,11 @@ infobar.error {
@define-color redhat #2d2d2d;
@define-color fedora #2f4265;
+@define-color msvsphere #343434;
/* theme colors/images */
-@define-color product_bg_color @fedora;
+@define-color product_bg_color @msvsphere;
/* logo and sidebar classes */
--
2.39.2

@ -0,0 +1,26 @@
From 50fb07a64192d2d84a1a58d1722a1f6263928cf1 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Wed, 29 Mar 2023 23:41:01 +0300
Subject: [PATCH 4/6] Add Minimal repository support
---
pyanaconda/core/constants.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 2f62cce..874c785 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -58,7 +58,8 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(),
"fedora-modular-server",
"rawhide",
"BaseOS", # Used by RHEL
- "baseos"] # Used by CentOS Stream
+ "baseos", # Used by CentOS Stream
+ "Minimal"] # Used by MSVSphere
DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS"
--
2.39.2

@ -0,0 +1,160 @@
From f28728f85b810f291666ef6334b4c3dbf1347ef2 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Thu, 30 Mar 2023 00:09:57 +0300
Subject: [PATCH 5/6] Change Fedora references to MSVSphere
---
data/liveinst/gnome/fedora-welcome.desktop | 2 +-
data/liveinst/gnome/fedora-welcome.js | 6 ++---
docs/intro.rst | 4 ++--
docs/iscsi.rst | 2 +-
po/ru.po | 28 +++++++++++-----------
pyanaconda/core/constants.py | 4 ++--
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
index 60e5c38..8b6fefb 100644
--- a/data/liveinst/gnome/fedora-welcome.desktop
+++ b/data/liveinst/gnome/fedora-welcome.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Welcome to Fedora
+Name=Welcome to MSVSphere
Exec=/usr/share/anaconda/gnome/fedora-welcome
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
index bbaf74f..65a1a35 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -1,8 +1,8 @@
Introduction to Anaconda
========================
-Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux
-and some other distributions.
+Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux,
+MSVSphere and some other distributions.
During installation, a target computer's hardware is identified and configured
and the appropriate file systems for the system's architecture are created.
diff --git a/docs/iscsi.rst b/docs/iscsi.rst
index 847078d..6d9c4b3 100644
--- a/docs/iscsi.rst
+++ b/docs/iscsi.rst
@@ -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
arguments or they are simply dracut bugs.
-Note that many of the iscsi adapters are installed in different Red Hat machines
+Note that many of the iscsi adapters are installed in different MSVSphere machines
and so the issues can often be reproduced and debugged.
diff --git a/po/ru.po b/po/ru.po
index e461fe9..51b1b34 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1477,13 +1477,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.ru."
msgstr ""
-"Это аппаратное обеспечение (или их комбинация) не поддерживается Red Hat. "
-"Для получения дополнительной информации о поддерживаемом оборудовании см. "
-"http://www.redhat.com/hardware."
+"Это аппаратное обеспечение (или их комбинация) не поддерживается ОС "
+"МСВСфера. Для получения дополнительной информации о поддерживаемом "
+"оборудовании см. https://msvsphere.ru."
#: pyanaconda/core/constants.py:165
msgid ""
@@ -7442,25 +7442,25 @@ msgstr "Установить Live CD на жёсткий диск"
#: data/liveinst/gnome/fedora-welcome.desktop:3
#: data/liveinst/gnome/fedora-welcome.js:65
-msgid "Welcome to Fedora"
-msgstr "Добро пожаловать в Fedora"
+msgid "Welcome to MSVSphere"
+msgstr "Добро пожаловать в ОС МСВСфера"
#: data/liveinst/liveinst-setup.desktop:4
msgid "Liveinst Setup"
msgstr "Настройка Liveinst"
#: data/liveinst/gnome/fedora-welcome.js:94
-msgid "Try Fedora"
-msgstr "Попробуйте Fedora"
+msgid "Try MSVSphere"
+msgstr "Попробуйте ОС МСВСфера"
#: data/liveinst/gnome/fedora-welcome.js:110
msgid ""
-"You are currently running Fedora from live media.\n"
-"You can install Fedora now, or choose \"Install to Hard Drive\" in the "
+"You are currently running MSVSphere from live media.\n"
+"You can install MSVSphere now, or choose \"Install to Hard Drive\" in the "
"Activities Overview at any later time."
msgstr ""
-"Fedora запущена с установочного диска.\n"
-"Вы можете установить Fedora сейчас или в любое время выбрать «Установить на "
+"ОС МСВСфера запущена с установочного диска.\n"
+"Вы можете установить ОС МСВСфера сейчас или в любое время выбрать «Установить на "
"жесткий диск» в меню «Обзор»."
#: data/liveinst/gnome/fedora-welcome.js:130
diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py
index 874c785..fc4df60 100644
--- a/pyanaconda/core/constants.py
+++ b/pyanaconda/core/constants.py
@@ -157,8 +157,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.ru."
)
# Storage messages
--
2.39.2

@ -0,0 +1,49 @@
From 9f7e42b75011fa4cdbce78ca4fbeb70d3357fea6 Mon Sep 17 00:00:00 2001
From: Eugene Zamriy <ezamriy@msvsphere.ru>
Date: Thu, 30 Mar 2023 00:11:34 +0300
Subject: [PATCH 6/6] Add MSVSphere product config
---
data/product.d/msvsphere.conf | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 data/product.d/msvsphere.conf
diff --git a/data/product.d/msvsphere.conf b/data/product.d/msvsphere.conf
new file mode 100644
index 0000000..d1d177b
--- /dev/null
+++ b/data/product.d/msvsphere.conf
@@ -0,0 +1,30 @@
+# Anaconda configuration file for MSVSphere.
+
+[Product]
+product_name = MSVSphere
+
+[Base Product]
+product_name = Red Hat Enterprise Linux
+
+[Anaconda]
+# List of enabled Anaconda DBus modules for RHEL.
+# but without org.fedoraproject.Anaconda.Modules.Subscription
+kickstart_modules =
+ org.fedoraproject.Anaconda.Modules.Timezone
+ org.fedoraproject.Anaconda.Modules.Network
+ org.fedoraproject.Anaconda.Modules.Localization
+ org.fedoraproject.Anaconda.Modules.Security
+ org.fedoraproject.Anaconda.Modules.Users
+ org.fedoraproject.Anaconda.Modules.Payloads
+ org.fedoraproject.Anaconda.Modules.Storage
+ org.fedoraproject.Anaconda.Modules.Services
+
+[Bootloader]
+efi_dir = msvsphere
+
+[Payload]
+enable_closest_mirror = True
+default_source = CLOSEST_MIRROR
+
+[License]
+eula = /usr/share/sphere-release/EULA
--
2.39.2

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 34.25.1.14
Release: 1%{?dist}
Release: 1%{?dist}.inferit
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -12,6 +12,14 @@ URL: http://fedoraproject.org/wiki/Anaconda
# make dist
Source0: %{name}-%{version}.tar.bz2
# MSVSphere patches
Patch1001: 0001-Disable-subscription.patch
Patch1002: 0002-Hide-CDN-source-button.patch
Patch1003: 0003-Set-MSVSphere-installer-colors.patch
Patch1004: 0004-Add-Minimal-repository-support.patch
Patch1005: 0005-Change-Fedora-references-to-MSVSphere.patch
Patch1006: 0006-Add-MSVSphere-product-config.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -224,7 +232,7 @@ Requires: rsync
Requires: device-mapper-multipath
Requires: zram-generator
# Submitting bugs to bugzilla
Requires: libreport-rhel-anaconda-bugzilla
# Requires: libreport-rhel-anaconda-bugzilla
%description install-img-deps
The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies.
@ -299,6 +307,10 @@ runtime on NFS/HTTP/FTP servers or local disks.
%prep
%autosetup -p 1
# de-branding
sed -e 's/RHEL/MSVSphere/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/MSVSphere/g' -i po/*.po
%build
# use actual build-time release number, not tarball creation time release number
%configure ANACONDA_RELEASE=%{release}
@ -407,8 +419,13 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 34.25.1.14-1
- Rebuilt for MSVSphere 9.1.
* 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
- Disabled RHEL subscription
- Rebuilt for MSVSphere 9.1
* Thu Sep 08 2022 Vendula Poncova <vponcova@redhat.com> - 34.25.1.14-1
- Do not crash on network --device link with wireless device (rvykydal)

Loading…
Cancel
Save