On Mon, Sep 22, 2014 at 01:52:03PM -0400, Cole Robinson wrote: > Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx> > --- > I added the test data before making the volume ID lookup actually work, > yet 'make check' still passed... Does the test suite not ensure isodata > is mapped to a valid OS? It does, but the file must be named foo.txt, in your patch it's only foo.iso. > > data/oses/ubuntu.xml.in | 67 ++++++++++++++++++++++ > .../ubuntu14.04/ubuntu-14.04.1-desktop-i386.iso | 29 ++++++++++ > 2 files changed, 96 insertions(+) > create mode 100644 test/isodata/ubuntu/ubuntu14.04/ubuntu-14.04.1-desktop-i386.iso > > diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in > index 3a5d248..78e9b2e 100644 > --- a/data/oses/ubuntu.xml.in > +++ b/data/oses/ubuntu.xml.in > @@ -1316,4 +1316,71 @@ > <script id='http://ubuntu.com/scripts/ubuntu/jeos'/> > </installer> > </os> > + > + <os id="http://ubuntu.com/ubuntu/14.04";> > + <short-id>ubuntu14.04</short-id> > + <short-id>ubuntutrusty</short-id> > + <_name>Ubuntu Trusty Tahr LTS</_name> > + <version>14.04</version> > + <_vendor>Canonical Ltd</_vendor> > + <family>linux</family> > + <distro>ubuntu</distro> > + <codename>Trusty Tahr</codename> > + <upgrades id="http://ubuntu.com/ubuntu/14.04"/> > + <derives-from id="http://ubuntu.com/ubuntu/14.04"/> > + > + <release-date>2014-04-26</release-date> > + <eol-date>2019-04-01</eol-date> > + > + <resources arch="all"> > + <minimum> > + <cpu>1000000000</cpu> > + <n-cpus>1</n-cpus> > + <ram>1073741824</ram> > + <storage>5368709120</storage> > + </minimum> > + <recommended> > + <cpu>1000000000</cpu> > + <ram>1073741824</ram> > + <storage>16106127360</storage> > + </recommended> > + </resources> > + > + <media arch="i686"> > + <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-i386.iso</url> > + <iso> > + <volume-id>Ubuntu-Server 14.04(.\d)? i386</volume-id> > + </iso> > + <kernel>casper/vmlinuz</kernel> > + <initrd>casper/initrd.img</initrd> > + </media> > + <media arch="x86_64"> > + <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-server-amd64.iso</url> > + <iso> > + <volume-id>Ubuntu-Server 14.04(.\d)? amd64</volume-id> > + </iso> > + <kernel>casper/vmlinuz</kernel> > + <initrd>casper/initrd.img</initrd> > + </media> These 2 entries are missing "LTS", see attached files > + <media arch="i686" live="true"> > + <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-i386.iso</url> > + <iso> > + <volume-id>Ubuntu 14.04(.\d)? LTS i386</volume-id> > + </iso> > + <kernel>casper/vmlinuz</kernel> > + <initrd>casper/initrd.img</initrd> > + </media> > + <media arch="x86_64" live="true"> > + <url>http://releases.ubuntu.com/releases/trusty/ubuntu-14.04-desktop-amd64.iso</url> > + <iso> > + <volume-id>Ubuntu 14.04(.\d)? amd64</volume-id> > + </iso> This is missing an LTS, I'm attaching the isoinfo output for this image. ACK with this fixed, with .iso renamed to .iso.txt, and with the additional isoinfo files squashed in. Christophe
CD-ROM is in ISO 9660 format
System id:
Volume id: Ubuntu-Server 14.04.1 LTS amd64
Volume set id:
Publisher id:
Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
Application id:
Copyright File id:
Abstract File id:
Bibliographic File id:
Volume set size is: 1
Volume set sequence number is: 1
Logical block size is: 2048
Volume size is: 292864
El Torito VD version 1 found, boot catalog is in sector 1926
Joliet with UCS level 3 found
Rock Ridge signatures version 1 found
Eltorito validation header:
Hid 1
Arch 0 (x86)
ID ''
Key 55 AA
Eltorito defaultboot header:
Bootid 88 (bootable)
Boot media 0 (No Emulation Boot)
Load segment 0
Sys type 0
Nsect 4
Bootoff A34B 41803
CD-ROM is in ISO 9660 format
System id:
Volume id: Ubuntu-Server 14.04.1 LTS i386
Volume set id:
Publisher id:
Data preparer id: XORRISO-1.1.8 2011.11.20.173001, LIBISOBURN-1.1.8, LIBISOFS-1.1.6, LIBBURN-1.1.8
Application id:
Copyright File id:
Abstract File id:
Bibliographic File id:
Volume set size is: 1
Volume set sequence number is: 1
Logical block size is: 2048
Volume size is: 282624
El Torito VD version 1 found, boot catalog is in sector 3754
Joliet with UCS level 3 found
Rock Ridge signatures version 1 found
Eltorito validation header:
Hid 1
Arch 0 (x86)
ID ''
Key 55 AA
Eltorito defaultboot header:
Bootid 88 (bootable)
Boot media 0 (No Emulation Boot)
Load segment 0
Sys type 0
Nsect 4
Bootoff E7F1 59377
CD-ROM is in ISO 9660 format
System id:
Volume id: Ubuntu 14.04.1 LTS amd64
Volume set id:
Publisher id:
Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
Application id:
Copyright File id:
Abstract File id:
Bibliographic File id:
Volume set size is: 1
Volume set sequence number is: 1
Logical block size is: 2048
Volume size is: 502272
El Torito VD version 1 found, boot catalog is in sector 166
Joliet with UCS level 3 found
Rock Ridge signatures version 1 found
Eltorito validation header:
Hid 1
Arch 0 (x86)
ID ''
Key 55 AA
Eltorito defaultboot header:
Bootid 88 (bootable)
Boot media 0 (No Emulation Boot)
Load segment 0
Sys type 0
Nsect 4
Bootoff 762D4 484052
Attachment:
pgp9mJTOS2RKz.pgp
Description: PGP signature
_______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
