On Fri, Apr 13, 2012 at 11:31:59AM +0200, Christophe Fergeau wrote: > LTS Ubuntu versions are respinned several times throughout their > lifetime to integrate all the updates on the iso. When this > happens, the volume ID becomes "Ubuntu 10.04.4 LTS i386" for example. > The additional 3rd digit is properly handled for 8.04 but not for > 10.04. This commit fixes the 10.04 volume ID regexp so that it handles > this case, and also adds the missing "LTS" to the regexp (rhbz#811871). > This fixes detection of the ubuntu 10.04.4 iso, I couldn't get my hands > on an older 10.04 iso to double check this doesn't cause a regression. That's why we have test cases for this kind of thing. Please provide a patch which adds the output of 'isoinfo -d -i ISOFILE' to the tests/isodata directory as appropriate. > --- > data/oses/ubuntu.xml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml > index 8ea6fdd..e4f2e1c 100644 > --- a/data/oses/ubuntu.xml > +++ b/data/oses/ubuntu.xml > @@ -824,7 +824,7 @@ > <media arch="i386" live="true"> > <url>http://old-releases.ubuntu.com/releases/lucid/ubuntu-10.04-desktop-i386.iso</url> > <iso> > - <volume-id>Ubuntu 10.04 i386</volume-id> > + <volume-id>Ubuntu 10.04(.\d)? LTS i386</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> > @@ -833,7 +833,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 amd64</volume-id> > + <volume-id>Ubuntu 10.04(.\d)? LTS amd64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>casper/vmlinuz</kernel> Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
