[Pkg-libvirt-commits] [Git][libvirt-team/virt-manager][debian/sid] 2 commits: Use the legacy installer URL for Ubuntu 20.04

[Guido Günther]

Guido Günther pushed to branch debian/sid at Libvirt Packaging Team / virt-manager


Commits:
9c3f6e7c by Pino Toscano at 2020-08-20T12:02:21+02:00
Use the legacy installer URL for Ubuntu 20.04

Backport the upstream commit b55b7e94622dd039d00b6e21b5d28d44ab944693,
adapting the patch to test_urls.ini.

- - - - -
fa58dcbc by Guido Günther at 2020-08-20T10:31:13+00:00
Merge branch 'ubuntu-20.04-url' into 'debian/sid'

Use the legacy installer URL for Ubuntu 20.04

See merge request libvirt-team/virt-manager!6
- - - - -


2 changed files:

- + debian/patches/series
- + debian/patches/upstream_urldetect-Deal-with-ubuntu-20.04-legacy-installer.patch


Changes:

=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+upstream_urldetect-Deal-with-ubuntu-20.04-legacy-installer.patch


=====================================
debian/patches/upstream_urldetect-Deal-with-ubuntu-20.04-legacy-installer.patch
=====================================
@@ -0,0 +1,71 @@
+From b55b7e94622dd039d00b6e21b5d28d44ab944693 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio at redhat.com>
+Date: Thu, 21 May 2020 17:41:18 +0200
+Subject: [PATCH] urldetect: Deal with ubuntu 20.04 legacy installer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+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 at redhat.com>
+Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
+---
+ tests/test_urls.ini      | 7 ++++++-
+ virtinst/install/urldetect.py | 4 ++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_urls.ini b/tests/test_urls.ini
+index dc3e148b..184ca7b8 100644
+--- a/tests/test_urls.ini
++++ b/tests/test_urls.ini
+@@ -177,12 +177,17 @@ testshortcircuit = 1
+ [ubuntu16.04]
+ url = http://us.archive.ubuntu.com/ubuntu/dists/xenial/main/installer-amd64
+ distro = ubuntu16.04
+-# Latest release.
+ # Check for xen for full coverage
+ [ubuntu19.04]
+ url = http://us.archive.ubuntu.com/ubuntu/dists/disco/main/installer-amd64
+ testxen = 1
+ 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
+ 
+ 
+ 
+diff --git a/virtinst/install/urldetect.py b/virtinst/install/urldetect.py
+index 12cec1b9..c64ab6ed 100644
+--- a/virtinst/install/urldetect.py
++++ b/virtinst/install/urldetect.py
+@@ -648,6 +648,8 @@ class _DebianDistro(_DistroTree):
+         media_type = None
+         if check_manifest("current/images/MANIFEST"):
+             media_type = "url"
++        elif check_manifest("current/legacy-images/MANIFEST"):
++            media_type = "legacy_url"
+         elif check_manifest("daily/MANIFEST"):
+             media_type = "daily"
+         elif cache.content_regex(".disk/info",
+@@ -705,6 +707,8 @@ class _DebianDistro(_DistroTree):
+             url_prefix = "daily"
+         elif self.cache.debian_media_type == "mounted_iso_url":
+             url_prefix = "install"
++        elif self.cache.debian_media_type == "legacy_url":
++            url_prefix = "current/legacy-images"
+ 
+         tree_arch = self._find_treearch()
+         hvmroot = "%s/netboot/%s-installer/%s/" % (url_prefix,
+-- 
+2.28.0
+



View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/6ebcff75de620b1eeef1ead237482f51ae3ef9c9...fa58dcbc4f7aacb61ecec7500e0816701e3a46e6

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/virt-manager/-/compare/6ebcff75de620b1eeef1ead237482f51ae3ef9c9...fa58dcbc4f7aacb61ecec7500e0816701e3a46e6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20200820/dc60099c/attachment-0001.html>