[Libosinfo] [PATCH] ubuntu: fix 17.04 & 17.10 locations

[Pino Toscano]

Use the latest versions available, or point to old-releases for EOLed
versions.
---
 data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 +++++++-------
 data/os/ubuntu.com/ubuntu-17.10.xml.in |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in
index 271d7ea..69e5a27 100644
--- a/data/os/ubuntu.com/ubuntu-17.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in
@@ -30,7 +30,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 17.04(.\d)? i386</volume-id>
       </iso>
@@ -38,7 +38,7 @@
       <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 17.04(.\d)? amd64</volume-id>
       </iso>
@@ -46,7 +46,7 @@
       <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="i686" live="true">
-      <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 17.04(.\d)? i386</volume-id>
       </iso>
@@ -54,7 +54,7 @@
       <initrd>casper/initrd.lz</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 17.04(.\d)? amd64</volume-id>
       </iso>
@@ -62,19 +62,19 @@
       <initrd>casper/initrd.lz</initrd>
     </media>
     <media arch="aarch64">
-      <url>http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-arm64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-arm64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 17.04(.\d)? arm64</volume-id>
       </iso>
     </media>
     <media arch="ppc64le">
-      <url>http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-ppc64el.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-ppc64el.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 17.04(.\d)? ppc64</volume-id>
       </iso>
     </media>
     <media arch="s390x">
-      <url>http://cdimage.ubuntu.com/releases/zesty/release/ubuntu-17.04-server-s390x.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/zesty/ubuntu-17.04-server-s390x.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 17.04(.\d)? s390x</volume-id>
       </iso>
diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in
index 4b75eed..b396197 100644
--- a/data/os/ubuntu.com/ubuntu-17.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in
@@ -30,7 +30,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10-server-i386.iso</url>
+      <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 17.10(.\d)? i386</volume-id>
       </iso>
@@ -38,7 +38,7 @@
       <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10-server-amd64.iso</url>
+      <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 17.10(.\d)? amd64</volume-id>
       </iso>
@@ -46,7 +46,7 @@
       <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10-desktop-amd64.iso</url>
+      <url>http://releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 17.10(.\d)? amd64</volume-id>
       </iso>
-- 
2.14.3