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

[virt-tools-list] [libosinfo] Stricter volume ID regex for Ubuntu server spins



From: "Zeeshan Ali (Khattak)" <zeeshanak gnome org>

Without this fix, we end-up getting destkop media wrongly matched to
server media.
---
 data/oses/ubuntu.xml |   60 +++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml
index e4f2e1c..9ad99bc 100644
--- a/data/oses/ubuntu.xml
+++ b/data/oses/ubuntu.xml
@@ -235,7 +235,7 @@
     <media arch="i386">
       <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>casper/vmlinuz</kernel>
@@ -244,7 +244,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>casper/vmlinuz</kernel>
@@ -253,7 +253,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>casper/vmlinuz</kernel>
@@ -262,7 +262,7 @@
     <media arch="hppa">
       <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>casper/vmlinuz</kernel>
@@ -271,7 +271,7 @@
     <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>
       <kernel>casper/vmlinuz</kernel>
@@ -280,7 +280,7 @@
     <media arch="sparc">
       <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>casper/vmlinuz</kernel>
@@ -363,7 +363,7 @@
     <media arch="i386">
       <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 6.10 i386</volume-id>
+        <volume-id>Ubuntu-Server 6.10 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -372,7 +372,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 6.10 amd64</volume-id>
+        <volume-id>Ubuntu-Server 6.10 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -381,7 +381,7 @@
     <media arch="ppc">
       <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-powerpc.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 6.10 ppc</volume-id>
+        <volume-id>Ubuntu-Server 6.10 ppc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -390,7 +390,7 @@
     <media arch="sparc">
       <url>http://old-releases.ubuntu.com/releases/edgy/ubuntu-6.10-server-sparc.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 6.10 sparc</volume-id>
+        <volume-id>Ubuntu-Server 6.10 sparc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -444,7 +444,7 @@
     <media arch="i386">
       <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 7.04 i386</volume-id>
+        <volume-id>Ubuntu-Server 7.04 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -453,7 +453,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 7.04 amd64</volume-id>
+        <volume-id>Ubuntu-Server 7.04 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -462,7 +462,7 @@
     <media arch="sparc">
       <url>http://old-releases.ubuntu.com/releases/feisty/ubuntu-7.04-server-sparc.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 7.04 sparc</volume-id>
+        <volume-id>Ubuntu-Server 7.04 sparc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -507,7 +507,7 @@
     <media arch="i386">
       <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 7.10 i386</volume-id>
+        <volume-id>Ubuntu-Server 7.10 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -516,7 +516,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 7.10 amd64</volume-id>
+        <volume-id>Ubuntu-Server 7.10 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -525,7 +525,7 @@
     <media arch="sparc">
       <url>http://old-releases.ubuntu.com/releases/gutsy/ubuntu-7.10-server-sparc.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 7.10 sparc</volume-id>
+        <volume-id>Ubuntu-Server 7.10 sparc</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -573,7 +573,7 @@
     <media arch="i386">
       <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>casper/vmlinuz</kernel>
@@ -582,7 +582,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>casper/vmlinuz</kernel>
@@ -646,7 +646,7 @@
     <media arch="i386">
       <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 8.10 i386</volume-id>
+        <volume-id>Ubuntu-Server 8.10 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -655,7 +655,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/intrepid/ubuntu-8.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 8.10 amd64</volume-id>
+        <volume-id>Ubuntu-Server 8.10 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -704,7 +704,7 @@
     <media arch="i386">
       <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>casper/vmlinuz</kernel>
@@ -713,7 +713,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>casper/vmlinuz</kernel>
@@ -758,7 +758,7 @@
     <media arch="i386">
       <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 9.10 i386</volume-id>
+        <volume-id>Ubuntu-Server 9.10 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -767,7 +767,7 @@
     <media arch="x86_64">
       <url>http://old-releases.ubuntu.com/releases/karmic/ubuntu-9.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 9.10 amd64</volume-id>
+        <volume-id>Ubuntu-Server 9.10 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -872,7 +872,7 @@
     <media arch="i386">
       <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 10.10 i386</volume-id>
+        <volume-id>Ubuntu-Server 10.10 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -881,7 +881,7 @@
     <media arch="x86_64">
       <url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 10.10 amd64</volume-id>
+        <volume-id>Ubuntu-Server 10.10 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -939,7 +939,7 @@
     <media arch="i386">
       <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 11.04 i386</volume-id>
+        <volume-id>Ubuntu-Server 11.04 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -948,7 +948,7 @@
     <media arch="x86_64">
       <url>http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 11.04 amd64</volume-id>
+        <volume-id>Ubuntu-Server 11.04 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -1006,7 +1006,7 @@
     <media arch="i386">
       <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 11.10 i386</volume-id>
+        <volume-id>Ubuntu-Server 11.10 i386</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -1015,7 +1015,7 @@
     <media arch="x86_64">
       <url>http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso</url>
       <iso>
-        <volume-id>Ubuntu(-Server)? 11.10 amd64</volume-id>
+        <volume-id>Ubuntu-Server 11.10 amd64</volume-id>
         <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
-- 
1.7.10.2


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