orion pushed to cobbler (f20). "Add patch to fix virt-install support for F21+/EL7 (bug #1188424)"

[notifications at fedoraproject.org]

From 62682b5ffc35c1baa09dd1fc6f2c528bab77aec8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Tue, 28 Apr 2015 10:44:48 -0600
Subject: Add patch to fix virt-install support for F21+/EL7 (bug #1188424)


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:
diff --git a/cobbler.spec b/cobbler.spec
index d4ee3a9..dcc79a9 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -16,8 +16,10 @@ Name: cobbler
 License: GPLv2+
 AutoReq: no
 Version: 2.6.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424
+Patch0: cobbler-virtinstall.patch
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
@@ -76,6 +78,7 @@ other applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .virtinstall
 
 %build
 %{__python2} setup.py build
@@ -270,6 +273,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Tue Apr 28 2015 Orion Poplawski <orion at cora.nwra.com> - 2.6.7-3
+- Add patch to fix virt-install support for F21+/EL7 (bug #1188424)
+
 * Mon Apr 27 2015 Orion Poplawski <orion at cora.nwra.com> - 2.6.7-2
 - Create and own directories in tftp_dir
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cobbler.git/commit/?h=f20&id=62682b5ffc35c1baa09dd1fc6f2c528bab77aec8