X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=cobbler-virtinstall.patch;fp=cobbler-virtinstall.patch;h=104cb0761a27573ba654ca1e1765d45433bfe0d9;hb=de4de048eb48a91e1dc67bc8d68887173dfd0939;hp=0000000000000000000000000000000000000000;hpb=6b75024ed78bbda048f70c1d26bb314ce9d019c2;p=packages%2Fcentos7%2Fcobbler.git

diff --git a/cobbler-virtinstall.patch b/cobbler-virtinstall.patch
new file mode 100644
index 0000000..104cb07
--- /dev/null
+++ b/cobbler-virtinstall.patch
@@ -0,0 +1,39 @@
+diff -up cobbler-2.6.7/koan/virtinstall.py.virtinstall cobbler-2.6.7/koan/virtinstall.py
+--- cobbler-2.6.7/koan/virtinstall.py.virtinstall	2014-12-31 05:15:51.000000000 -0700
++++ cobbler-2.6.7/koan/virtinstall.py	2015-04-28 10:41:39.583415477 -0600
+@@ -69,7 +69,17 @@ except:
+         for variant in variants:
+             supported_variants.add(variant.split()[0])
+     except:
+-        pass # No problem, we'll just use generic
++        try:
++            # maybe on newer os using osinfo-query?
++            rc, response = utils.subprocess_get_response(
++                    shlex.split('osinfo-query os'))
++            variants = response.split('\n')
++            for variant in variants:
++                supported_variants.add(variant.split()[0])
++        except:
++            # okay, probably on old os and we'll just use generic26
++            pass
++
+ 
+ def _sanitize_disks(disks):
+     ret = []
+@@ -359,7 +369,15 @@ def build_commandline(uri,
+             # make sure virt-install knows about our os_version,
+             # otherwise default it to virtio26 or generic26
+             found = False
+-            if os_version not in supported_variants:
++            if os_version in supported_variants:
++                pass # os_version is correct
++            elif os_version + ".0" in supported_variants:
++                # osinfo based virt-install only knows about major.minor
++                # variants, not just major variants like it used to. Default
++                # to major.0 variant in that case. Lack of backwards
++                # compatibility in virt-install grumble grumble.
++                os_version = os_version + ".0"
++            else:
+                 if "virtio26" in supported_variants:
+                     os_version = "virtio26"
+                 else: