1 diff -up cobbler-2.6.7/koan/virtinstall.py.virtinstall cobbler-2.6.7/koan/virtinstall.py
2 --- cobbler-2.6.7/koan/virtinstall.py.virtinstall 2014-12-31 05:15:51.000000000 -0700
3 +++ cobbler-2.6.7/koan/virtinstall.py 2015-04-28 10:41:39.583415477 -0600
4 @@ -69,7 +69,17 @@ except:
5 for variant in variants:
6 supported_variants.add(variant.split()[0])
8 - pass # No problem, we'll just use generic
10 + # maybe on newer os using osinfo-query?
11 + rc, response = utils.subprocess_get_response(
12 + shlex.split('osinfo-query os'))
13 + variants = response.split('\n')
14 + for variant in variants:
15 + supported_variants.add(variant.split()[0])
17 + # okay, probably on old os and we'll just use generic26
21 def _sanitize_disks(disks):
23 @@ -359,7 +369,15 @@ def build_commandline(uri,
24 # make sure virt-install knows about our os_version,
25 # otherwise default it to virtio26 or generic26
27 - if os_version not in supported_variants:
28 + if os_version in supported_variants:
29 + pass # os_version is correct
30 + elif os_version + ".0" in supported_variants:
31 + # osinfo based virt-install only knows about major.minor
32 + # variants, not just major variants like it used to. Default
33 + # to major.0 variant in that case. Lack of backwards
34 + # compatibility in virt-install grumble grumble.
35 + os_version = os_version + ".0"
37 if "virtio26" in supported_variants:
38 os_version = "virtio26"