summaryrefslogtreecommitdiffstats
path: root/system/virt-manager/Add-Slackware-to-OS-choices.patch
diff options
context:
space:
mode:
Diffstat (limited to 'system/virt-manager/Add-Slackware-to-OS-choices.patch')
-rw-r--r--system/virt-manager/Add-Slackware-to-OS-choices.patch53
1 files changed, 24 insertions, 29 deletions
diff --git a/system/virt-manager/Add-Slackware-to-OS-choices.patch b/system/virt-manager/Add-Slackware-to-OS-choices.patch
index 18aadb62cf..0a5260206f 100644
--- a/system/virt-manager/Add-Slackware-to-OS-choices.patch
+++ b/system/virt-manager/Add-Slackware-to-OS-choices.patch
@@ -1,37 +1,21 @@
-diff -Nur virt-manager-1.5.0.orig/virtinst/osdict.py virt-manager-1.5.0/virtinst/osdict.py
---- virt-manager-1.5.0.orig/virtinst/osdict.py 2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/osdict.py 2018-02-19 00:52:00.750416744 -0600
-@@ -159,6 +159,7 @@
- "rhel5": "rhel5.0",
- "rhel6": "rhel6.0",
- "rhel7": "rhel7.0",
-+ "slackware": "slackware14.2",
- "ubuntuhardy": "ubuntu8.04",
- "ubuntuintrepid": "ubuntu8.10",
- "ubuntujaunty": "ubuntu9.04",
-@@ -373,7 +374,7 @@
- # EOL date. So assume None == EOL, add some manual work arounds.
- # We should fix this in a new libosinfo version, and then drop
- # this hack
-- if self._is_related_to(["fedora24", "rhel7.0", "debian6",
-+ if self._is_related_to(["slackware14.2", "fedora24", "rhel7.0", "debian6",
- "ubuntu13.04", "win8", "win2k12", "mageia5", "centos7.0"],
- check_clones=False, check_derives=False):
- return True
-diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virtinst/urlfetcher.py
---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py 2018-01-27 14:57:20.000000000 -0600
-+++ virt-manager-1.5.0/virtinst/urlfetcher.py 2018-02-19 00:52:00.751416752 -0600
-@@ -1379,6 +1379,43 @@
- return False
+diff -Nur virt-manager-2.2.0.orig/virtinst/install/urldetect.py virt-manager-2.2.0/virtinst/install/urldetect.py
+--- virt-manager-2.2.0.orig/virtinst/install/urldetect.py 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/install/urldetect.py 2019-07-03 02:14:35.978571412 -0500
+@@ -466,6 +466,47 @@
+ return cache.treeinfo_family_regex(famregex)
-+class SlackwareDistro(Distro):
++class SlackwareDistro(_DistroTree):
+ # slackware doesn't have installable URLs, so this is just for a
+ # mounted ISO
+ name = "Slackware"
+ urldistro = "slackware"
+ os_variant = "linux"
+
++ PRETTY_NAME = "Slackware"
++ matching_distros = ["slackware"]
++ _variant_prefix = "slackware"
++
+ _boot_iso_paths = []
+ _xen_kernel_paths = []
+
@@ -62,6 +46,17 @@ diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virt
+ return False
+
+
- # Build list of all *Distro classes
- def _build_distro_list():
- allstores = []
+ class _SuseDistro(_RHELDistro):
+ PRETTY_NAME = None
+ _suse_regex = []
+diff -Nur virt-manager-2.2.0.orig/virtinst/osdict.py virt-manager-2.2.0/virtinst/osdict.py
+--- virt-manager-2.2.0.orig/virtinst/osdict.py 2019-06-17 00:20:11.000000000 -0500
++++ virt-manager-2.2.0/virtinst/osdict.py 2019-07-03 02:11:59.208399622 -0500
+@@ -146,6 +146,7 @@
+ "rhel5": "rhel5.0",
+ "rhel6": "rhel6.0",
+ "rhel7": "rhel7.0",
++ "slackware": "slackware14.2",
+ "ubuntuhardy": "ubuntu8.04",
+ "ubuntuintrepid": "ubuntu8.10",
+ "ubuntujaunty": "ubuntu9.04",