|
 |
1070a0 |
diff -rupN cobbler-2.0.7.old/koan/virtinstall.py cobbler-2.0.7/koan/virtinstall.py
|
|
|
1070a0 |
--- cobbler-2.0.7.old/koan/virtinstall.py 2015-01-22 11:11:27.917649507 -0500
|
|
|
1070a0 |
+++ cobbler-2.0.7/koan/virtinstall.py 2015-01-22 11:30:07.849523465 -0500
|
|
|
1070a0 |
@@ -69,7 +69,16 @@ except:
|
|
|
1070a0 |
for variant in variants:
|
|
|
1070a0 |
supported_variants.add(variant.split()[0])
|
|
|
1070a0 |
except:
|
|
|
1070a0 |
- pass # No problem, we'll just use generic
|
|
|
1070a0 |
+ try:
|
|
|
1070a0 |
+ # maybe on newer os using osinfo-query?
|
|
|
1070a0 |
+ rc, response = utils.subprocess_get_response(
|
|
|
1070a0 |
+ shlex.split('osinfo-query os'))
|
|
|
1070a0 |
+ variants = response.split('\n')
|
|
|
1070a0 |
+ for variant in variants:
|
|
|
1070a0 |
+ supported_variants.add(variant.split()[0])
|
|
|
1070a0 |
+ except:
|
|
|
1070a0 |
+ # okay, probably on old os and we'll just use generic26
|
|
|
1070a0 |
+ pass
|
|
|
1070a0 |
|
|
|
1070a0 |
def _sanitize_disks(disks):
|
|
|
1070a0 |
ret = []
|
|
|
1070a0 |
@@ -362,6 +371,12 @@ def build_commandline(uri,
|
|
|
1070a0 |
found = False
|
|
|
1070a0 |
if os_version in supported_variants:
|
|
|
1070a0 |
cmd += "--os-variant %s " % os_version
|
|
|
1070a0 |
+ elif os_version + ".0" in supported_variants:
|
|
|
1070a0 |
+ # osinfo based virt-install only knows about major.minor
|
|
|
1070a0 |
+ # variants, not just major variants like it used to. Default
|
|
|
1070a0 |
+ # to major.0 variant in that case. Lack of backwards
|
|
|
1070a0 |
+ # compatibility in virt-install grumble grumble.
|
|
|
1070a0 |
+ cmd += "--os-variant %s" % os_version + ".0 "
|
|
|
1070a0 |
else:
|
|
|
1070a0 |
print ("- warning: virt-install doesn't know this os_version, defaulting to generic26")
|
|
|
1070a0 |
cmd += "--os-variant generic26 "
|