openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

urldetect: Deal with ubuntu 20.04 legacy installer 

Ubuntu 20.04 has a new installer, which is yet not supported by
virt-install / osinfo-db, and this made ubuntu switch their URLs
for the old installer to current/legacy-images/... instead of
current/images/...

Let's adapt URL detect so it can deal with this new "legacy"
style.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2020-05-21 17:41:18 +02:00 committed by Cole Robinson
parent 4cdf2dc37d
commit b55b7e9462
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/data/test_urls.ini
View File

@ -177,12 +177,17 @@ testshortcircuit = 1
[ubuntu16.04] [ubuntu16.04]
url = http://us.archive.ubuntu.com/ubuntu/dists/xenial/main/installer-amd64 url = http://us.archive.ubuntu.com/ubuntu/dists/xenial/main/installer-amd64
distro = ubuntu16.04 distro = ubuntu16.04
# Latest release.
# Check for xen for full coverage # Check for xen for full coverage
[ubuntu19.04] [ubuntu19.04]
url = http://us.archive.ubuntu.com/ubuntu/dists/disco/main/installer-amd64 url = http://us.archive.ubuntu.com/ubuntu/dists/disco/main/installer-amd64
testxen = 1 testxen = 1
distro = ubuntu19.04 distro = ubuntu19.04
# Latest release.
# Check for legacy-images for full coverage
[ubuntu20.04]
url = http://archive.ubuntu.com/ubuntu/dists/focal/main/installer-amd64
kernelregex = current/legacy-images/netboot/ubuntu-installer/.*
distro = ubuntu20.04

4
virtinst/install/urldetect.py
View File

@ -648,6 +648,8 @@ class _DebianDistro(_DistroTree):
media_type = None media_type = None
if check_manifest("current/images/MANIFEST"): if check_manifest("current/images/MANIFEST"):
media_type = "url" media_type = "url"
elif check_manifest("current/legacy-images/MANIFEST"):
media_type = "legacy_url"
elif check_manifest("daily/MANIFEST"): elif check_manifest("daily/MANIFEST"):
media_type = "daily" media_type = "daily"
elif cache.content_regex(".disk/info", elif cache.content_regex(".disk/info",
@ -705,6 +707,8 @@ class _DebianDistro(_DistroTree):
url_prefix = "daily" url_prefix = "daily"
elif self.cache.debian_media_type == "mounted_iso_url": elif self.cache.debian_media_type == "mounted_iso_url":
url_prefix = "install" url_prefix = "install"
elif self.cache.debian_media_type == "legacy_url":
url_prefix = "current/legacy-images"
tree_arch = self._find_treearch() tree_arch = self._find_treearch()
hvmroot = "%s/netboot/%s-installer/%s/" % (url_prefix, hvmroot = "%s/netboot/%s-installer/%s/" % (url_prefix,