|
|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
From 076dd539e89c704e486c38350f5859caaf502bf7 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From c330f35f646f1b13cdeb052b815c927cfd050b7d Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Eugene Zamriy <evgeniy.zamriy@softline.com>
|
|
|
|
|
Date: Thu, 18 May 2023 11:38:45 +0300
|
|
|
|
|
Subject: [PATCH 11/11] Add MSVSphere identification support
|
|
|
|
|
@ -7,12 +7,12 @@ 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 | 136 +++++++++++++-----
|
|
|
|
|
pyanaconda/product.py | 23 ++-
|
|
|
|
|
pyanaconda/product.py | 30 +++-
|
|
|
|
|
.../ui/gui/spokes/installation_progress.py | 8 +-
|
|
|
|
|
.../ui/gui/spokes/lib/storage_dialogs.py | 4 +-
|
|
|
|
|
pyanaconda/ui/gui/spokes/welcome.py | 15 +-
|
|
|
|
|
pyanaconda/vnc.py | 27 +++-
|
|
|
|
|
8 files changed, 166 insertions(+), 53 deletions(-)
|
|
|
|
|
8 files changed, 173 insertions(+), 53 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/fedora-welcome.desktop
|
|
|
|
|
index 90f5678..abbbff3 100644
|
|
|
|
|
@ -325,10 +325,18 @@ index c478f3f..914b54c 100644
|
|
|
|
|
#: data/liveinst/gnome/fedora-welcome.js:130
|
|
|
|
|
msgid ""
|
|
|
|
|
diff --git a/pyanaconda/product.py b/pyanaconda/product.py
|
|
|
|
|
index 9dbfe1f..4f78491 100644
|
|
|
|
|
index 9dbfe1f..34118d0 100644
|
|
|
|
|
--- a/pyanaconda/product.py
|
|
|
|
|
+++ b/pyanaconda/product.py
|
|
|
|
|
@@ -64,9 +64,30 @@ def trim_product_version_for_ui(version):
|
|
|
|
|
@@ -19,6 +19,7 @@
|
|
|
|
|
|
|
|
|
|
import configparser
|
|
|
|
|
import os
|
|
|
|
|
+import re
|
|
|
|
|
|
|
|
|
|
from pyanaconda.core.i18n import _
|
|
|
|
|
|
|
|
|
|
@@ -64,9 +65,36 @@ def trim_product_version_for_ui(version):
|
|
|
|
|
|
|
|
|
|
productVersion = trim_product_version_for_ui(productVersion)
|
|
|
|
|
|
|
|
|
|
@ -337,8 +345,14 @@ index 9dbfe1f..4f78491 100644
|
|
|
|
|
+ if productName == "MSVSphere Server" or \
|
|
|
|
|
+ (productName == "MSVSphere" and productVariant == "Minimal"):
|
|
|
|
|
+ productFlavor = "Server"
|
|
|
|
|
+ elif productName == "MSVSphere ARM":
|
|
|
|
|
+ productFlavor = "ARM"
|
|
|
|
|
+ elif productName == "MSVSphere" and productVariant == "BaseOS":
|
|
|
|
|
+ productFlavor = "OS"
|
|
|
|
|
+ elif productName == "MSVSphere":
|
|
|
|
|
+ os_release = open("/etc/os-release", "r")
|
|
|
|
|
+ for line in os_release:
|
|
|
|
|
+ match = re.match("PRETTY_NAME=.*\((.*?)\)", line)
|
|
|
|
|
+ if match:
|
|
|
|
|
+ productFlavor = match.group(1)
|
|
|
|
|
+ else:
|
|
|
|
|
+ productFlavor = "OS"
|
|
|
|
|
+else:
|
|
|
|
|
|
