On Tue, Jul 29, 2014 at 10:36:56AM +0200, Giuseppe Scrivano wrote: > Roman Bogorodskiy <bogorodskiy@xxxxxxxxx> writes: > > > --- > > data/oses/freebsd.xml.in | 4 +-- > > .../freebsd/freebsd9.3/freebsd-9.3-amd64.txt | 33 ++++++++++++++++++++++ > > .../freebsd/freebsd9.3/freebsd-9.3-i386.txt | 33 ++++++++++++++++++++++ > > test/test-isodetect.c | 7 +++++ > > 4 files changed, 75 insertions(+), 2 deletions(-) > > create mode 100644 test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt > > create mode 100644 test/isodata/freebsd/freebsd9.3/freebsd-9.3-i386.txt > > > > diff --git a/data/oses/freebsd.xml.in b/data/oses/freebsd.xml.in > > index d1d6486..c8be1bf 100644 > > --- a/data/oses/freebsd.xml.in > > +++ b/data/oses/freebsd.xml.in > > @@ -587,7 +587,7 @@ > > <eol-date>2016-12-31</eol-date> > > > > <media arch='i686'> > > - <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso</url> > > + <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso</url> > > <iso> > > <publisher-id>THE FREEBSD PROJECT. HTTP://WWW.FREEBSD.ORG/</publisher-id> > > <system-id>FreeBSD</system-id> > > @@ -596,7 +596,7 @@ > > </media> > > > > <media arch='x86_64'> > > - <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/i386/i386/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-i386-disc1.iso</url> > > + <url>ftp://ftp.freebsd.org/pub/FreeBSD/releases/amd64/amd64/ISO-IMAGES/9.3/FreeBSD-9.3-RELEASE-amd64-disc1.iso</url> > > <iso> > > <publisher-id>THE FREEBSD PROJECT. HTTP://WWW.FREEBSD.ORG/</publisher-id> > > <system-id>FreeBSD</system-id> > > diff --git a/test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt b/test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt > > new file mode 100644 > > index 0000000..c01e5fc > > --- /dev/null > > +++ b/test/isodata/freebsd/freebsd9.3/freebsd-9.3-amd64.txt > > @@ -0,0 +1,33 @@ > > +CD-ROM is in ISO 9660 format > > +System id: FreeBSD > > +Volume id: FREEBSD_INSTALL > > now that I look at your tests, I see that the "Volume id" is not clearly > defining the version. Wouldn't this test detect as FreeBSD9.3 also > older FreeBSD versions that have the same Volume id? > > I've found this bug reported by Daniel: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=165876 > > Should we perhaps drop the ISO part? Yes, without that bug being fixed, we should not be defining any <iso> data matches because it is definitely going to match incorrect ISO images from other versions :-( Roman, if you have any contacts in Free BSD team to try and push that bug along it would be awesome. It should be such a trivial fix to make to simply add a version to this metadata when invoking the ISO building tool... Regards, 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 :| _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
