ACK Christophe On Tue, Sep 23, 2014 at 09:54:34AM -0400, Cole Robinson wrote: > This just adds a plain Fedora21 entry. F21 is going to have different > versions like 'Workstation' and 'Server' but we don't seem to distinguish > for other distros so I just stuck with the pattern here. > > This currently doesn't work for detecting Workstation media, since their > volume IDs are truncated. Bug tracking that: > > https://bugzilla.redhat.com/show_bug.cgi?id=1145264 > Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx> > --- > v2: > - Add <release-status> tag > - Update fedora-unknown relationship > - Add a comment after fedora-unknown to make it harder to miss > > data/oses/fedora.xml.in | 101 ++++++++++++++++++++- > .../Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt | 29 ++++++ > 2 files changed, 126 insertions(+), 4 deletions(-) > create mode 100644 test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt > > diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in > index 27cdd4a..1c1953a 100644 > --- a/data/oses/fedora.xml.in > +++ b/data/oses/fedora.xml.in > @@ -1533,6 +1533,94 @@ > </installer> > </os> > > + <os id="http://fedoraproject.org/fedora/21";> > + <short-id>fedora21</short-id> > + <_name>Fedora 21</_name> > + <version>21</version> > + <_vendor>Fedora Project</_vendor> > + <family>linux</family> > + <distro>fedora</distro> > + <upgrades id="http://fedoraproject.org/fedora/20"/> > + <derives-from id="http://fedoraproject.org/fedora/20"/> > + <release-status>prerelease</release-status> > + > + <media arch="i686"> > + <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/ > +Fedora/i386/iso/Fedora-21-i386-DVD.iso</url> --> > + <iso> > + <volume-id>Fedora.*21.*-i386</volume-id> > + <system-id>LINUX</system-id> > + </iso> > + <kernel>isolinux/vmlinuz</kernel> > + <initrd>isolinux/initrd.img</initrd> > + </media> > + <media arch="x86_64"> > + <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/ > +Fedora/x86_64/iso/Fedora-21-x86_64-DVD.iso</url> --> > + <iso> > + <volume-id>Fedora.*-21.*-x86_64</volume-id> > + <system-id>LINUX</system-id> > + </iso> > + <kernel>isolinux/vmlinuz</kernel> > + <initrd>isolinux/initrd.img</initrd> > + </media> > + > + <!-- Workstation live media has a truncated volume ID at the moment > + which doesn't include the actual Fedora version, so this won't work > + https://bugzilla.redhat.com/show_bug.cgi?id=1145264 --> > + <media arch="i686" live="true"> > + <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Live/i386/Fedora-Live-Desktop-i686-21-1.iso</url> --> > + <iso> > + <volume-id>Fedora-Live-.*-i686-21</volume-id> > + <system-id>LINUX</system-id> > + </iso> > + <kernel>isolinux/vmlinuz0</kernel> > + <initrd>isolinux/initrd0.img</initrd> > + </media> > + <media arch="x86_64" live="true"> > + <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Live/x86_64/Fedora-Live-Desktop-x86_64-21-1.iso</url> --> > + <iso> > + <volume-id>Fedora-Live-.*-x86_64-21</volume-id> > + <system-id>LINUX</system-id> > + </iso> > + <kernel>isolinux/vmlinuz0</kernel> > + <initrd>isolinux/initrd0.img</initrd> > + </media> > + > + <tree arch="i686"> > + <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Fedora/i386/os/</url> --> > + <treeinfo> > + <family>Fedora</family> > + <version>21</version> > + <arch>i386</arch> > + </treeinfo> > + </tree> > + <tree arch="x86_64"> > + <!-- <url>http://download.fedoraproject.org/pub/fedora/linux/releases/21/Fedora/x86_64/os/</url> --> > + <treeinfo> > + <family>Fedora</family> > + <version>21</version> > + <arch>x86_64</arch> > + </treeinfo> > + </tree> > + > + <resources arch="all"> > + <minimum> > + <n-cpus>1</n-cpus> > + <cpu>1000000000</cpu> > + <ram>1073741824</ram> > + <storage>10737418240</storage> > + </minimum> > + </resources> > + > + <!-- Lets uncomment these after testing them --> > + <!--<installer> > + <script id='http://fedoraproject.org/scripts/fedora/jeos'/> > + <script id='http://fedoraproject.org/scripts/fedora/desktop'/> > + </installer>--> > + </os> > + > + > <!-- Generic entry for future Fedora releases. Please update the 'upgrades', > 'derives-from', 'volume-id' and 'resources' nodes accordingly each time > you add a new (specific) entry for a new release. --> > @@ -1543,19 +1631,19 @@ > <_vendor>Fedora Project</_vendor> > <family>linux</family> > <distro>fedora</distro> > - <upgrades id="http://fedoraproject.org/fedora/20"/> > - <derives-from id="http://fedoraproject.org/fedora/20"/> > + <upgrades id="http://fedoraproject.org/fedora/21"/> > + <derives-from id="http://fedoraproject.org/fedora/21"/> > <release-status>prerelease</release-status> > > <media arch="i686"> > <iso> > - <volume-id>Fedora ([2-9][1-9]|[0-9]{3,}).* i386</volume-id> > + <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-i386</volume-id> > <system-id>LINUX</system-id> > </iso> > </media> > <media arch="x86_64"> > <iso> > - <volume-id>Fedora ([2-9][1-9]|[0-9]{3,}).* x86_64</volume-id> > + <volume-id>Fedora.*-([2-9][1-9]|[0-9]{3,}).*-x86_64</volume-id> > <system-id>LINUX</system-id> > </iso> > <kernel>isolinux/vmlinuz</kernel> > @@ -1584,4 +1672,9 @@ > </minimum> > </resources> > </os> > + > + <!-- Do not add entry here, the last entry should always be fedora-unknown. > + And if adding a new entry, make sure to update fedora-unknown as > + mentioned in the comment above. --> > + > </libosinfo> > diff --git a/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt > new file mode 100644 > index 0000000..f4e9436 > --- /dev/null > +++ b/test/isodata/fedora/fedora21/Fedora-Server-DVD-x86_64-21_Alpha_TC7.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: LINUX > +Volume id: Fedora-S-21_A_T7-x86_64 > +Volume set id: > +Publisher id: > +Data preparer id: > +Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM > +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: 979923 > +El Torito VD version 1 found, boot catalog is in sector 439 > +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 1B8 440 > -- > 2.1.0 > > _______________________________________________ > Libosinfo mailing list > Libosinfo@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libosinfo
Attachment:
pgpjm55nLk9z7.pgp
Description: PGP signature
_______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
