|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
From b5103f457ae40c5a448bdc9728e76cff7d4a51bd 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/15] Add MSVSphere identification support
|
|
|
|
|
Subject: [PATCH] Add MSVSphere identification support
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
data/liveinst/gnome/fedora-welcome.desktop | 4 +-
|
|
|
|
|
@ -12,8 +12,8 @@ Subject: [PATCH 11/15] Add MSVSphere identification support
|
|
|
|
|
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 | 41 +++-
|
|
|
|
|
9 files changed, 273 insertions(+), 61 deletions(-)
|
|
|
|
|
pyanaconda/vnc.py | 42 +++-
|
|
|
|
|
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
|
|
|
|
|
@ -616,7 +616,7 @@ index de71615..7937f2c 100644
|
|
|
|
|
|
|
|
|
|
# Retranslate the language (filtering) entry's placeholder text
|
|
|
|
|
diff --git a/pyanaconda/vnc.py b/pyanaconda/vnc.py
|
|
|
|
|
index 5fadcde..d0cdbb9 100644
|
|
|
|
|
index 5fadcde..c349de8 100644
|
|
|
|
|
--- a/pyanaconda/vnc.py
|
|
|
|
|
+++ b/pyanaconda/vnc.py
|
|
|
|
|
@@ -76,7 +76,22 @@ class VncServer(object):
|
|
|
|
|
@ -643,11 +643,12 @@ index 5fadcde..d0cdbb9 100644
|
|
|
|
|
% {'productName': product.productName,
|
|
|
|
|
'productVersion': product.productVersion}
|
|
|
|
|
|
|
|
|
|
@@ -145,7 +160,29 @@ class VncServer(object):
|
|
|
|
|
@@ -145,8 +160,29 @@ class VncServer(object):
|
|
|
|
|
|
|
|
|
|
# figure out product info
|
|
|
|
|
if host:
|
|
|
|
|
- self.desktop = _("%(productName)s %(productVersion)s installation "
|
|
|
|
|
- "on host %(name)s") \
|
|
|
|
|
+ is_sphere = product.productBase == "MSVSphere"
|
|
|
|
|
+ if is_sphere and product.productFlavor == "Server":
|
|
|
|
|
+ desktop_text = _("MSVSphere %(productVersion)s Server "
|
|
|
|
|
@ -671,9 +672,9 @@ index 5fadcde..d0cdbb9 100644
|
|
|
|
|
+ desktop_text = _("%(productName)s %(productVersion)s "
|
|
|
|
|
+ "installation on host %(name)s")
|
|
|
|
|
+ self.desktop = desktop_text \
|
|
|
|
|
"on host %(name)s") \
|
|
|
|
|
% {'productName': product.productName,
|
|
|
|
|
'productVersion': product.productVersion,
|
|
|
|
|
'name': host}
|
|
|
|
|
--
|
|
|
|
|
2.44.0
|
|
|
|
|
|
|
|
|
|
|
