File virtinst-add-sle15-detection-support.patch of Package virt-manager.14017

Overview Repositories Revisions Requests Users Attributes Meta

File virtinst-add-sle15-detection-support.patch of Package virt-manager.14017

References: bsc#1054986
With SLE15 and openSUSE 15 the content file has been removed from the media.
This file was used for SUSE distro version and arch detection. Now detection
must be done by parsing the .treeinfo file.
We must continue to keep the content parsing code for the older distros.
As a fallback, detection is also setup to look at the media.1/products and
media.1/build files.

Index: virt-manager-1.5.1/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.5.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.5.1/virtinst/urlfetcher.py
@@ -416,7 +416,23 @@ def _distroFromSUSEContent(fetcher, arch
     try:
         cbuf = fetcher.acquireFileContent("content")
     except ValueError:
-        return None
+        try:
+            # If no content file, try media.1/products and media.1/build and create
+            # a cbuf with enough info for the content file parsing code below to work
+            pbuf = fetcher.acquireFileContent("media.1/products").strip()
+            pbuf = pbuf.split(' ', 1)[1].strip()
+            # The media.1/products file naming convention changed between SLE11 and SLE12
+            if pbuf.startswith('SLE'):
+                pbuf = pbuf.split(' ')[0]
+                pbuf = " ".join(re.split('(\d+)', pbuf, 1))
+            cbuf = "\nDISTRO ," + pbuf.replace('-', ' ')
+            try:
+                bbuf = fetcher.acquireFileContent("media.1/build").split('-')
+            except:
+                bbuf = ["x86_64"]
+            cbuf = cbuf + "\n" + " ".join(bbuf)
+        except ValueError:
+            return None
 
     distribution = None
     distro_version = None
@@ -489,7 +505,7 @@ def _distroFromSUSEContent(fetcher, arch
     dclass = GenericDistro
     if distribution:
         if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
-                re.match(".*SUSE SLES*", distribution[1]):
+           re.match(".*SUSE SLES*", distribution[1]) or re.match("SLES*", distribution[1]):
             dclass = SLESDistro
             if distro_version is None:
                 distro_version = _parse_sle_distribution(distribution)
@@ -507,10 +523,13 @@ def _distroFromSUSEContent(fetcher, arch
             if distro_version is None:
                 dparts = distribution[1].strip().rsplit(' ')
                 distro_version = ['VERSION', dparts[len(dparts)-1]]
-        elif re.match(".*openSUSE.*", distribution[1]):
+        elif re.match(".*openSUSE.*", distribution[1]) or re.match("openSUSE *", distribution[1]):
             dclass = OpensuseDistro
             if distro_version is None:
-                distro_version = ['VERSION', distribution[0].strip().rsplit(':')[4]]
+                if ':' in distribution[0]:
+                    distro_version = ['VERSION', distribution[0].strip().rsplit(':')[4]]
+                else:
+                    distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[2]]
 
     if distro_version is None:
         return None
@@ -1029,6 +1048,7 @@ class SLDistro(RHELDistro):
 
 class SuseDistro(Distro):
     name = "SUSE"
+    uses_treeinfo = True
 
     _boot_iso_paths   = ["boot/boot.iso"]
 
@@ -1066,8 +1086,11 @@ class SuseDistro(Distro):
                 self._xen_kernel_paths = [("boot/%s/vmlinuz-xenpae" % self.arch,
                                             "boot/%s/initrd-xenpae" % self.arch)]
             else:
-                self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch,
-                                            "boot/%s/initrd-xen" % self.arch)]
+                self._xen_kernel_paths = [("boot/%s/loader/linux" % self.arch,
+                                                  "boot/%s/loader/initrd" % self.arch)]
+                # By appending this gets searched for first
+                self._xen_kernel_paths.append(("boot/%s/vmlinuz-xen" % self.arch,
+                                            "boot/%s/initrd-xen" % self.arch))
 
     def _variantFromVersion(self):
         distro_version = self.version_from_content[1].strip()
@@ -1075,11 +1098,11 @@ class SuseDistro(Distro):
         self.os_variant = self.urldistro
 
         sp_version = None
-        if self.os_variant.startswith(("sles", "sled")):
+        if self.os_variant.startswith(("sle")):
             if len(distro_version.split('.', 1)) == 2:
                 sp_version = 'sp' + distro_version.split('.', 1)[1].strip()
-            self.os_variant += version
-            if sp_version:
+            self.os_variant += version.replace(" ", "").lower()
+            if sp_version and sp_version != 'sp0':
                 self.os_variant += sp_version
         elif self.os_variant.startswith("opensuse"):
             if len(version) == 8:
@@ -1103,6 +1126,25 @@ class SuseDistro(Distro):
             self.os_variant += "9"
 
     def isValidStore(self):
+        if self.treeinfo:
+            ret = False
+            if self.urldistro:
+                family = self.treeinfo.get("general", "family")
+                if "SUSE Linux Enterprise Server" in family and 'sles' in self.urldistro or \
+                   "SUSE Linux Enterprise Desktop" in family and 'sled' in self.urldistro or \
+                   "SUSE Linux Enterprise" in family and 'sle' in self.urldistro or \
+                   "SUSE Containers" in family and 'caasp' in self.urldistro or \
+                   "SUSE CaaS" in family and 'caasp' in self.urldistro or \
+                   "openSUSE" in family and 'opensuse' in self.urldistro or \
+                   "Open Enterprise" in family and 'oes' in self.urldistro:
+                    ret = True
+            if ret:
+                version = self.treeinfo.get("general", "version")
+                distro_version = ['VERSION', version]
+                self.version_from_content = distro_version
+                self._variantFromVersion()
+            return ret
+
         # self.version_from_content is the VERSION line from the contents file
         if (not self.version_from_content or
             self.version_from_content[1] is None):
@@ -1138,6 +1180,10 @@ class SuseDistro(Distro):
         return self.os_variant
 
 
+class SLEDistro(SuseDistro):
+    urldistro = "sle"
+
+
 class SLESDistro(SuseDistro):
     urldistro = "sles"
 
@@ -1154,8 +1200,6 @@ class OESDistro(SuseDistro):
     urldistro = "oes"
 
 
-# Suse  image store is harder - we fetch the kernel RPM and a helper
-# RPM and then munge bits together to generate a initrd
 class OpensuseDistro(SuseDistro):
     urldistro = "opensuse"

Places

File virtinst-add-sle15-detection-support.patch of Package virt-manager.14017

Places