|
 |
1070a0 |
--- a/koan/virtinstall.py 2018-11-12 05:32:23.803251480 -0500
|
|
|
1070a0 |
+++ b/koan/virtinstall.py 2018-11-12 06:40:17.454546012 -0500
|
|
|
1070a0 |
@@ -70,12 +70,13 @@ except:
|
|
|
1070a0 |
supported_variants.add(variant.split()[0])
|
|
|
1070a0 |
except:
|
|
|
1070a0 |
try:
|
|
|
1070a0 |
- # maybe on newer os using osinfo-query?
|
|
|
1070a0 |
- rc, response = utils.subprocess_get_response(
|
|
|
1070a0 |
- shlex.split('osinfo-query os'))
|
|
|
1070a0 |
+ rc, response = subprocess_get_response(
|
|
|
1070a0 |
+ shlex.split('osinfo-query -f short-id os'))
|
|
|
1070a0 |
variants = response.decode('utf-8').split('\n')
|
|
|
1070a0 |
for variant in variants:
|
|
|
1070a0 |
- supported_variants.add(variant.split()[0])
|
|
|
1070a0 |
+ supported_variants.add(variant.strip())
|
|
|
1070a0 |
+ # osinfo-query does not list virtio26, add it here for fallback
|
|
|
1070a0 |
+ supported_variants.add('virtio26')
|
|
|
1070a0 |
except:
|
|
|
1070a0 |
# okay, probably on old os and we'll just use generic26
|
|
|
1070a0 |
pass
|
|
|
1070a0 |
@@ -367,19 +368,24 @@ def build_commandline(uri,
|
|
|
1070a0 |
if suse_version_re.match(os_version):
|
|
|
1070a0 |
os_version = suse_version_re.match(os_version).groups()[0]
|
|
|
1070a0 |
# make sure virt-install knows about our os_version,
|
|
|
1070a0 |
- # otherwise default it to generic26
|
|
|
1070a0 |
- found = False
|
|
|
1070a0 |
+ # otherwise default it to virtio26 or generic26
|
|
|
1070a0 |
+ # found = False
|
|
|
1070a0 |
if os_version in supported_variants:
|
|
|
1070a0 |
- cmd += "--os-variant %s " % os_version
|
|
|
1070a0 |
+ pass # os_version is correct
|
|
|
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 |
+ os_version = os_version + ".0"
|
|
|
1070a0 |
else:
|
|
|
1070a0 |
- print(("- warning: virt-install doesn't know this os_version, defaulting to generic26"))
|
|
|
1070a0 |
- cmd += "--os-variant generic26 "
|
|
|
1070a0 |
+ if "virtio26" in supported_variants:
|
|
|
1070a0 |
+ os_version = "virtio26"
|
|
|
1070a0 |
+ else:
|
|
|
1070a0 |
+ os_version = "generic26"
|
|
|
1070a0 |
+ print("- warning: virt-install doesn't know this os_version, "
|
|
|
1070a0 |
+ "defaulting to %s" % os_version)
|
|
|
1070a0 |
+ cmd += "--os-variant %s " % os_version
|
|
|
1070a0 |
else:
|
|
|
1070a0 |
distro = "unix"
|
|
|
1070a0 |
if breed in [ "debian", "suse", "redhat" ]:
|