virt-manager/virtinst-detect-suse-distros.patch

Index: virt-manager-1.0.0/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.0.0.orig/virtinst/urlfetcher.py
+++ virt-manager-1.0.0/virtinst/urlfetcher.py
@@ -296,6 +296,68 @@ def _distroFromTreeinfo(fetcher, arch, v
 
     return ob
 
+def _distroFromContent(fetcher, arch, vmtype=None):
+    # Parse content file for the 'LABEL' field containing the distribution name
+    # None if no content, GenericDistro if unknown label type.
+    if not fetcher.hasFile("content"):
+        return None
+
+    distribution = None
+    distro_version = None
+    filename = fetcher.acquireFile("content")
+    cbuf = f = None
+    try:
+        f = open(filename, "r")
+        cbuf = f.read()
+    except:
+        if f:
+            f.close()
+        os.unlink(filename)
+        return None
+    f.close()
+    os.unlink(filename)
+
+    lines = cbuf.splitlines()[1:]
+    for line in lines:
+        if line.startswith("LABEL "):
+            distribution = line.split(' ', 1)
+            if distro_version:
+                break
+        if line.startswith("VERSION "):
+            distro_version = line.split(' ', 1)
+            if distribution:
+                break
+        if line.startswith("SUMMARY "):
+            distro_summary = line.split(' ', 1)
+
+    if not distribution and distro_summary:
+        distribution = distro_summary
+
+    if distribution:
+        if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
+            re.match(".*SUSE SLES*", distribution[1]):
+            dclass = SLESDistro
+            if distro_version is None:
+                distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
+        elif re.match(".*SUSE Linux Enterprise Desktop*", distribution[1]):
+            dclass = SLEDDistro
+            if distro_version is None:
+                distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
+        elif re.match(".*openSUSE.*", distribution[1]):
+            dclass = OpensuseDistro
+            if distro_version is None:
+                distro_version = ['VERSION', '13.1']
+        else:
+            dclass = GenericDistro
+
+    ob = dclass(fetcher, arch, vmtype)
+    if dclass != GenericDistro:
+        ob.content = distro_version
+
+    # Explictly call this, so we populate os_type/variant info
+    ob.isValidStore()
+
+    return ob
 
 def getDistroStore(guest, fetcher):
     stores = []
@@ -312,6 +374,10 @@ def getDistroStore(guest, fetcher):
     if dist:
         return dist
 
+    dist = _distroFromContent(fetcher, arch, _type)
+    if dist:
+        return dist
+
     # FIXME: This 'distro ==' doesn't cut it. 'distro' is from our os
     # dictionary, so would look like 'fedora9' or 'rhel5', so this needs
     # to be a bit more intelligent
@@ -808,12 +874,11 @@ class SLDistro(RHELDistro):
 
 class SuseDistro(Distro):
     name = "SUSE"
-    urldistro = "suse"
-    os_variant = "linux"
 
     _boot_iso_paths   = ["boot/boot.iso"]
 
     def __init__(self, *args, **kwargs):
+        self.content = None
         Distro.__init__(self, *args, **kwargs)
         if re.match(r'i[4-9]86', self.arch):
             self.arch = 'i386'
@@ -824,18 +889,32 @@ class SuseDistro(Distro):
             oldkern += "64"
             oldinit += "64"
 
-        # Tested with Opensuse >= 10.2, 11, and sles 10
-        self._hvm_kernel_paths = [("boot/%s/loader/linux" % self.arch,
-                                    "boot/%s/loader/initrd" % self.arch)]
-        # Tested with Opensuse 10.0
-        self._hvm_kernel_paths.append(("boot/loader/%s" % oldkern,
-                                       "boot/loader/%s" % oldinit))
-
-        # Matches Opensuse > 10.2 and sles 10
-        self._xen_kernel_paths = [("boot/%s/vmlinuz-xen" % self.arch,
-                                    "boot/%s/initrd-xen" % self.arch)]
+        if self.arch == "s390x":
+            self._hvm_kernel_paths = [ ("boot/%s/vmrdr.ikr" % self.arch,
+                                        "boot/%s/initrd" % self.arch) ]
+            # No Xen on s390x
+            self._xen_kernel_paths = []
+        else:
+            # Tested with Opensuse >= 10.2, 11, and sles 10
+            self._hvm_kernel_paths = [ ("boot/%s/loader/linux" % self.arch,
+                                        "boot/%s/loader/initrd" % self.arch) ]
+            # Tested with Opensuse 10.0
+            self._hvm_kernel_paths.append(("boot/loader/%s" % oldkern,
+                                           "boot/loader/%s" % oldinit))
+
+            # Matches Opensuse > 10.2 and sles 10
+            self._xen_kernel_paths = [ ("boot/%s/vmlinuz-xen" % self.arch,
+                                        "boot/%s/initrd-xen" % self.arch) ]
 
     def isValidStore(self):
+        # self.content is the VERSION line from the contents file
+        distro_version = self.content[1]
+        version = distro_version.split('.', 1)[0].strip()
+        if int(version) >= 10:
+            self.os_variant += version
+        else:
+            self.os_variant += "9"
+
         if not self.fetcher.hasFile("directory.yast"):
             return False
 
@@ -860,6 +939,27 @@ class SuseDistro(Distro):
                 return name
         return self.os_variant
 
+class SLESDistro(SuseDistro):
+
+    urldistro = "sles"
+    os_variant = "sles"
+
+class SLEDDistro(SuseDistro):
+
+    urldistro = "sled"
+    os_variant = "sled"
+
+# 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"
+    os_variant = "opensuse"
+
+class OESDistro(SuseDistro):
+
+    urldistro = "oes"
+    os_variant = "oes"
 
 class DebianDistro(Distro):
     # ex. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/