[osinfo-db PATCH 1/4] ubuntu: Improve the volume-id regex

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The first release of Ubuntu ISOs usually have their volume-id as, for
instance:
Ubuntu-Server 18.04 LTS amd64

Whenever a new release is done, a new digit is added as, for instance:
Ubuntu-Server 18.04.1 LTS amd64

However, at least with 18.04, they had a new release for the server
media that looks like:
Ubuntu-Server 18.04.1+ LTS amd64

This '+' addition breaks the current used regular expression to match
the media's volume-id. In order to take a safer path, let's expand all
the regular expressions that have '(.\d)?' to use '(.\d\+?)?' instead,
being able then to also match the '+'.

The command used to change all the entries is:
sed -i -e 's/(.\\d)?/(.\\d\\+?)?/g' ubuntu-*.xml.in

Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
---
 data/os/ubuntu.com/ubuntu-10.04.xml.in |  4 ++--
 data/os/ubuntu.com/ubuntu-12.04.xml.in |  8 ++++----
 data/os/ubuntu.com/ubuntu-14.04.xml.in |  8 ++++----
 data/os/ubuntu.com/ubuntu-14.10.xml.in |  8 ++++----
 data/os/ubuntu.com/ubuntu-15.04.xml.in |  8 ++++----
 data/os/ubuntu.com/ubuntu-15.10.xml.in |  8 ++++----
 data/os/ubuntu.com/ubuntu-16.04.xml.in | 14 ++++++-------
 data/os/ubuntu.com/ubuntu-16.10.xml.in | 16 +++++++--------
 data/os/ubuntu.com/ubuntu-17.04.xml.in | 14 ++++++-------
 data/os/ubuntu.com/ubuntu-17.10.xml.in | 12 +++++------
 data/os/ubuntu.com/ubuntu-18.04.xml.in | 10 ++++-----
 data/os/ubuntu.com/ubuntu-18.10.xml.in | 12 +++++------
 data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 ++++-----
 data/os/ubuntu.com/ubuntu-6.06.xml.in  | 28 +++++++++++++-------------
 data/os/ubuntu.com/ubuntu-8.04.xml.in  | 12 +++++------
 data/os/ubuntu.com/ubuntu-9.04.xml.in  |  8 ++++----
 16 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-10.04.xml.in b/data/os/ubuntu.com/ubuntu-10.04.xml.in
index 6a0d759..2a53801 100644
--- a/data/os/ubuntu.com/ubuntu-10.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-10.04.xml.in
@@ -32,7 +32,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 10.04(.\d)? LTS i386</volume-id>
+        <volume-id>Ubuntu 10.04(.\d\+?)? LTS i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -41,7 +41,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu 10.04(.\d\+?)? LTS amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in b/data/os/ubuntu.com/ubuntu-12.04.xml.in
index b81df0a..0093f16 100644
--- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
@@ -32,7 +32,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 12.04(.\d)? LTS i386</volume-id>
+        <volume-id>Ubuntu-Server 12.04(.\d\+?)? LTS i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -40,7 +40,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 12.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu-Server 12.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -48,7 +48,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 12.04(.\d)? LTS i386</volume-id>
+        <volume-id>Ubuntu 12.04(.\d\+?)? LTS i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -56,7 +56,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/precise/ubuntu-12.04-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 12.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu 12.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-14.04.xml.in b/data/os/ubuntu.com/ubuntu-14.04.xml.in
index 40394bb..5e095b6 100644
--- a/data/os/ubuntu.com/ubuntu-14.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.04.xml.in
@@ -33,7 +33,7 @@
     <media arch="i686">
       <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 14.04(.\d)? LTS i386</volume-id>
+        <volume-id>Ubuntu-Server 14.04(.\d\+?)? LTS i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -41,7 +41,7 @@
     <media arch="x86_64">
       <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 14.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu-Server 14.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -49,7 +49,7 @@
     <media arch="i686" live="true">
       <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id>
+        <volume-id>Ubuntu 14.04(.\d\+?)? LTS i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -57,7 +57,7 @@
     <media arch="x86_64" live="true">
       <url>http://releases.ubuntu.com/14.04/ubuntu-14.04.5-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 14.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu 14.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-14.10.xml.in b/data/os/ubuntu.com/ubuntu-14.10.xml.in
index 47512cd..e759776 100644
--- a/data/os/ubuntu.com/ubuntu-14.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-14.10.xml.in
@@ -33,7 +33,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 14.10(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 14.10(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -41,7 +41,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 14.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 14.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -49,7 +49,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 14.10(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 14.10(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -57,7 +57,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/utopic/ubuntu-14.10-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 14.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 14.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in b/data/os/ubuntu.com/ubuntu-15.04.xml.in
index 4aa990d..5848586 100644
--- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
@@ -33,7 +33,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 15.04(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 15.04(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -41,7 +41,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 15.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 15.04(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -49,7 +49,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 15.04(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 15.04(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -57,7 +57,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/vivid/ubuntu-15.04-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 15.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 15.04(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in b/data/os/ubuntu.com/ubuntu-15.10.xml.in
index 1c0d792..7a10190 100644
--- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
@@ -33,7 +33,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 15.10(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 15.10(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -41,7 +41,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 15.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 15.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -49,7 +49,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 15.10(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 15.10(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -57,7 +57,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/wily/ubuntu-15.10-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 15.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 15.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
index 3f96cba..27b2d58 100644
--- a/data/os/ubuntu.com/ubuntu-16.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -33,7 +33,7 @@
     <media arch="i686">
       <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.04(.\d)? LTS i386</volume-id>
+        <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -41,7 +41,7 @@
     <media arch="x86_64">
       <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -49,7 +49,7 @@
     <media arch="i686" live="true">
       <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 16.04(.\d)? LTS i386</volume-id>
+        <volume-id>Ubuntu 16.04(.\d\+?)? LTS i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -57,7 +57,7 @@
     <media arch="x86_64" live="true">
       <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 16.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu 16.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -65,13 +65,13 @@
     <media arch="ppc">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc</volume-id>
+        <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS ppc</volume-id>
       </iso>
     </media>
     <media arch="ppc64le">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-ppc64el.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.04(.\d)? LTS ppc64</volume-id>
+        <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS ppc64</volume-id>
       </iso>
       <kernel>install/vmlinux</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -79,7 +79,7 @@
     <media arch="s390x">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-s390x.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.04(.\d)? LTS s390x</volume-id>
+        <volume-id>Ubuntu-Server 16.04(.\d\+?)? LTS s390x</volume-id>
       </iso>
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-16.10.xml.in b/data/os/ubuntu.com/ubuntu-16.10.xml.in
index 43372cb..09fff4f 100644
--- a/data/os/ubuntu.com/ubuntu-16.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-16.10.xml.in
@@ -33,7 +33,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.10(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 16.10(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -41,7 +41,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 16.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -49,7 +49,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 16.10(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 16.10(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -57,7 +57,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 16.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 16.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -65,7 +65,7 @@
     <media arch="aarch64">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-arm64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.10(.\d)? arm64</volume-id>
+        <volume-id>Ubuntu-Server 16.10(.\d\+?)? arm64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -73,13 +73,13 @@
     <media arch="ppc">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-powerpc.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.10(.\d)? ppc</volume-id>
+        <volume-id>Ubuntu-Server 16.10(.\d\+?)? ppc</volume-id>
       </iso>
     </media>
     <media arch="ppc64le">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-ppc64el.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.10(.\d)? ppc64</volume-id>
+        <volume-id>Ubuntu-Server 16.10(.\d\+?)? ppc64</volume-id>
       </iso>
       <kernel>install/vmlinux</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -87,7 +87,7 @@
     <media arch="s390x">
       <url>http://old-releases.ubuntu.com/releases/yakkety/ubuntu-16.10-server-s390x.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 16.10(.\d)? s390x</volume-id>
+        <volume-id>Ubuntu-Server 16.10(.\d\+?)? s390x</volume-id>
       </iso>
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in b/data/os/ubuntu.com/ubuntu-17.04.xml.in
index 40c49dd..53111b9 100644
--- a/data/os/ubuntu.com/ubuntu-17.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in
@@ -47,7 +47,7 @@
     <media arch="i686">
       <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>
+        <volume-id>Ubuntu-Server 17.04(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -55,7 +55,7 @@
     <media arch="x86_64">
       <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>
+        <volume-id>Ubuntu-Server 17.04(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -63,7 +63,7 @@
     <media arch="i686" live="true">
       <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>
+        <volume-id>Ubuntu 17.04(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -71,7 +71,7 @@
     <media arch="x86_64" live="true">
       <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>
+        <volume-id>Ubuntu 17.04(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -79,7 +79,7 @@
     <media arch="aarch64">
       <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>
+        <volume-id>Ubuntu-Server 17.04(.\d\+?)? arm64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -87,7 +87,7 @@
     <media arch="ppc64le">
       <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>
+        <volume-id>Ubuntu-Server 17.04(.\d\+?)? ppc64</volume-id>
       </iso>
       <kernel>install/vmlinux</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -95,7 +95,7 @@
     <media arch="s390x">
       <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>
+        <volume-id>Ubuntu-Server 17.04(.\d\+?)? s390x</volume-id>
       </iso>
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in b/data/os/ubuntu.com/ubuntu-17.10.xml.in
index 181e4aa..f31637e 100644
--- a/data/os/ubuntu.com/ubuntu-17.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in
@@ -33,7 +33,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 17.10(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 17.10(.\d\+?)? i386</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -41,7 +41,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 17.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 17.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -49,7 +49,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10.1-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 17.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 17.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz.efi</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -57,7 +57,7 @@
     <media arch="aarch64">
       <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-arm64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 17.10(.\d)? arm64</volume-id>
+        <volume-id>Ubuntu-Server 17.10(.\d\+?)? arm64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -65,7 +65,7 @@
     <media arch="ppc64le">
       <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-ppc64el.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 17.10(.\d)? ppc64</volume-id>
+        <volume-id>Ubuntu-Server 17.10(.\d\+?)? ppc64</volume-id>
       </iso>
       <kernel>install/vmlinux</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -73,7 +73,7 @@
     <media arch="s390x">
       <url>http://old-releases.ubuntu.com/releases/artful/ubuntu-17.10-server-s390x.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 17.10(.\d)? s390x</volume-id>
+        <volume-id>Ubuntu-Server 17.10(.\d\+?)? s390x</volume-id>
       </iso>
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in
index 3b3c595..41f780b 100644
--- a/data/os/ubuntu.com/ubuntu-18.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in
@@ -34,7 +34,7 @@
     <media arch="x86_64">
       <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -42,7 +42,7 @@
     <media arch="x86_64" live="true">
       <url>http://releases.ubuntu.com/releases/bionic/ubuntu-18.04.1-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 18.04(.\d)? LTS amd64</volume-id>
+        <volume-id>Ubuntu 18.04(.\d\+?)? LTS amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.lz</initrd>
@@ -50,7 +50,7 @@
     <media arch="aarch64">
       <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-arm64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.04(.\d)? LTS arm64</volume-id>
+        <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS arm64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -58,7 +58,7 @@
     <media arch="ppc64le">
       <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-ppc64el.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.04(.\d)? LTS ppc64</volume-id>
+        <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS ppc64</volume-id>
       </iso>
       <kernel>install/vmlinux</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -66,7 +66,7 @@
     <media arch="s390x">
       <url>http://cdimage.ubuntu.com/releases/18.04/release/ubuntu-18.04.1-server-s390x.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.04(.\d)? LTS s390x</volume-id>
+        <volume-id>Ubuntu-Server 18.04(.\d\+?)? LTS s390x</volume-id>
       </iso>
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-18.10.xml.in b/data/os/ubuntu.com/ubuntu-18.10.xml.in
index a699dc0..2d2aefa 100644
--- a/data/os/ubuntu.com/ubuntu-18.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-18.10.xml.in
@@ -34,7 +34,7 @@
     <media arch="x86_64">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id>
         <volume-size>751828992</volume-size>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -43,7 +43,7 @@
     <media arch="x86_64" live="true" installer-script="false">
       <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-live-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 18.10(.\d\+?)? amd64</volume-id>
         <volume-size>923795456</volume-size>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -52,7 +52,7 @@
     <media arch="x86_64" live="true">
       <url>http://releases.ubuntu.com/18.10/ubuntu-18.10-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 18.10(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 18.10(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd</initrd>
@@ -60,7 +60,7 @@
     <media arch="aarch64">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-arm64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.10(.\d)? arm64</volume-id>
+        <volume-id>Ubuntu-Server 18.10(.\d\+?)? arm64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -68,7 +68,7 @@
     <media arch="ppc64le">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-ppc64el.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.10(.\d)? ppc64</volume-id>
+        <volume-id>Ubuntu-Server 18.10(.\d\+?)? ppc64</volume-id>
       </iso>
       <kernel>install/vmlinux</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -76,7 +76,7 @@
     <media arch="s390x">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/18.10/release/ubuntu-18.10-server-s390x.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 18.10(.\d)? s390x</volume-id>
+        <volume-id>Ubuntu-Server 18.10(.\d\+?)? s390x</volume-id>
       </iso>
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in
index fd4083b..09012a6 100644
--- a/data/os/ubuntu.com/ubuntu-19.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in
@@ -35,7 +35,7 @@
     <media arch="x86_64">
       <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 19.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 19.04(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -43,7 +43,7 @@
     <media arch="x86_64" live="true">
       <url>http://cdimage.ubuntu.com/daily-live/current/disco-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 19.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 19.04(.\d\+?)? amd64</volume-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd</initrd>
@@ -51,7 +51,7 @@
     <media arch="aarch64">
       <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-arm64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 19.04(.\d)? arm64</volume-id>
+        <volume-id>Ubuntu-Server 19.04(.\d\+?)? arm64</volume-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
@@ -59,7 +59,7 @@
     <media arch="ppc64le">
       <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-ppc64el.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 19.04(.\d)? ppc64</volume-id>
+        <volume-id>Ubuntu-Server 19.04(.\d\+?)? ppc64</volume-id>
       </iso>
        <kernel>install/vmlinux</kernel>
        <initrd>install/initrd.gz</initrd>
@@ -67,7 +67,7 @@
     <media arch="s390x">
       <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/disco-server-s390x.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 19.04(.\d)? s390x</volume-id>
+        <volume-id>Ubuntu-Server 19.04(.\d\+?)? s390x</volume-id>
       </iso>
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
diff --git a/data/os/ubuntu.com/ubuntu-6.06.xml.in b/data/os/ubuntu.com/ubuntu-6.06.xml.in
index 54dfc4c..8e44116 100644
--- a/data/os/ubuntu.com/ubuntu-6.06.xml.in
+++ b/data/os/ubuntu.com/ubuntu-6.06.xml.in
@@ -19,7 +19,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 6.06(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -28,7 +28,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 6.06(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -37,7 +37,7 @@
     <media arch="ppc">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-powerpc.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? ppc</volume-id>
+        <volume-id>Ubuntu-Server 6.06(.\d\+?)? ppc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/powerpc/vmlinux</kernel>
@@ -46,7 +46,7 @@
     <media arch="parisc">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-hppa.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? hppa</volume-id>
+        <volume-id>Ubuntu-Server 6.06(.\d\+?)? hppa</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz-hppa32</kernel>
@@ -55,14 +55,14 @@
     <media arch="ia64">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-ia64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? ia64</volume-id>
+        <volume-id>Ubuntu-Server 6.06(.\d\+?)? ia64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
     <media arch="sparc64">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-server-sparc.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 6.06(.\d)? sparc</volume-id>
+        <volume-id>Ubuntu-Server 6.06(.\d\+?)? sparc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>boot/sparc64</kernel>
@@ -72,7 +72,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -81,7 +81,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -90,7 +90,7 @@
     <media arch="ppc" live="true">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-desktop-powerpc.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? ppc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/powerpc/vmlinux</kernel>
@@ -100,7 +100,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -109,7 +109,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -118,7 +118,7 @@
     <media arch="ppc" live="true">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-dvd-powerpc.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ppc</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? ppc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/powerpc/vmlinux</kernel>
@@ -128,7 +128,7 @@
     <media arch="parisc" live="true">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-hppa.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? hppa</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? hppa</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinux-hppa32</kernel>
@@ -137,7 +137,7 @@
     <media arch="ia64">
       <url>http://old-releases.ubuntu.com/releases/dapper/ubuntu-6.06-alternate-ia64.iso</url>
       <iso>
-        <volume-id>Ubuntu 6.06(.\d)? ia64</volume-id>
+        <volume-id>Ubuntu 6.06(.\d\+?)? ia64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
     </media>
diff --git a/data/os/ubuntu.com/ubuntu-8.04.xml.in b/data/os/ubuntu.com/ubuntu-8.04.xml.in
index e322f72..77003a8 100644
--- a/data/os/ubuntu.com/ubuntu-8.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-8.04.xml.in
@@ -23,7 +23,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 8.04(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 8.04(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -32,7 +32,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 8.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 8.04(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -42,7 +42,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 8.04(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -51,7 +51,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 8.04(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -61,7 +61,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 8.04(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 8.04(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -70,7 +70,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/hardy/ubuntu-8.04-dvd-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 8.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 8.04(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
diff --git a/data/os/ubuntu.com/ubuntu-9.04.xml.in b/data/os/ubuntu.com/ubuntu-9.04.xml.in
index d925615..0551b2f 100644
--- a/data/os/ubuntu.com/ubuntu-9.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-9.04.xml.in
@@ -23,7 +23,7 @@
     <media arch="i686">
       <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 9.04(.\d)? i386</volume-id>
+        <volume-id>Ubuntu-Server 9.04(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -32,7 +32,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 9.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu-Server 9.04(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>install/vmlinuz</kernel>
@@ -42,7 +42,7 @@
     <media arch="i686" live="true">
       <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu 9.04(.\d)? i386</volume-id>
+        <volume-id>Ubuntu 9.04(.\d\+?)? i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -51,7 +51,7 @@
     <media arch="x86_64" live="true">
       <url>http://old-releases.ubuntu.com/releases/jaunty/ubuntu-9.04-desktop-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu 9.04(.\d)? amd64</volume-id>
+        <volume-id>Ubuntu 9.04(.\d\+?)? amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
-- 
2.20.1

_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo





[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Fedora Users]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux