[Libosinfo] [PATCH 2/2] fedora: Add F22 info

[Christophe Fergeau]

On Wed, May 27, 2015 at 12:35:48AM +0100, Zeeshan Ali (Khattak) wrote:
> This time around, we also recommend RAM and storage to some nice sane
> values.
> 
> Test data for each media is included.
> ---
>  data/oses/fedora.xml.in                            | 174 ++++++++++++++++++++-
>  .../Fedora-Live-Workstation-i686-22-3.iso.txt      |  29 ++++
>  .../Fedora-Live-Workstation-x86_64-22-3.iso.txt    |  29 ++++
>  .../fedora22/Fedora-Server-DVD-i386-22.iso.txt     |  29 ++++
>  .../fedora22/Fedora-Server-DVD-x86_64-22.iso.txt   |  29 ++++
>  .../fedora22/Fedora-Server-netinst-i386-22.iso.txt |  29 ++++
>  .../Fedora-Server-netinst-x86_64-22.iso.txt        |  29 ++++
>  .../Fedora-Workstation-netinst-i386-22.iso.txt     |  29 ++++
>  .../Fedora-Workstation-netinst-x86_64-22.iso.txt   |  29 ++++
>  9 files changed, 404 insertions(+), 2 deletions(-)
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Live-Workstation-i686-22-3.iso.txt
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Live-Workstation-x86_64-22-3.iso.txt
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Server-DVD-i386-22.iso.txt
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Server-DVD-x86_64-22.iso.txt
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Server-netinst-i386-22.iso.txt
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Server-netinst-x86_64-22.iso.txt
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Workstation-netinst-i386-22.iso.txt
>  create mode 100644 test/isodata/fedora/fedora22/Fedora-Workstation-netinst-x86_64-22.iso.txt
> 
> diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
> index 2e4b898..2b6e994 100644
> --- a/data/oses/fedora.xml.in
> +++ b/data/oses/fedora.xml.in
> @@ -4081,6 +4081,171 @@
>      </installer>
>    </os>
>  
> +  <os id="http://fedoraproject.org/fedora/22">
> +    <short-id>fedora22</short-id>
> +    <_name>Fedora 22</_name>
> +    <version>22</version>
> +    <_vendor>Fedora Project</_vendor>
> +    <family>linux</family>
> +    <distro>fedora</distro>
> +    <upgrades id="http://fedoraproject.org/fedora/21"/>
> +    <derives-from id="http://fedoraproject.org/fedora/21"/>
> +
> +    <release-date>2015-05-26</release-date>
> +
> +    <variant id="workstation">
> +      <_name>Fedora 22 Workstation</_name>
> +    </variant>
> +    <variant id="workstation-netinst">
> +      <_name>Fedora 22</_name>
> +    </variant>

Why not "Fedora 22 Workstation" here?

> +    <variant id="server">
> +      <_name>Fedora 22 Server</_name>
> +    </variant>
> +    <variant id="server-netinst">
> +      <_name>Fedora 22</_name>
> +    </variant>
> +
> +    <!-- Workstation -->
> +
> +    <!-- Live -->
> +    <media arch="i686" live="true">
> +      <variant id="workstation"/>
> +      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Live-Workstation-i686-22-3.iso</url>
> +      <iso>
> +        <volume-id>Fedora-Live-WS-i686-22.*</volume-id>
> +        <system-id>LINUX</system-id>
> +        <volume-size>1398321152</volume-size>
> +      </iso>
> +      <kernel>isolinux/vmlinuz0</kernel>
> +      <initrd>isolinux/initrd0.img</initrd>
> +    </media>
> +    <media arch="x86_64" live="true">
> +      <variant id="workstation"/>
> +      <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Live-Workstation-x86_64-22-3.iso</url>
> +      <iso>
> +        <volume-id>Fedora-Live-WS-x86_64-22.*</volume-id>
> +        <system-id>LINUX</system-id>
> +        <volume-size>1430704128</volume-size>
> +      </iso>
> +      <kernel>isolinux/vmlinuz0</kernel>
> +      <initrd>isolinux/initrd0.img</initrd>
> +    </media>
> +
> +    <!-- Network Installer !-->
> +    <media arch="i686">
> +      <variant id="workstation-netinst"/>

Looks like this would be much better expressed as
<media arch="i686" installer="true" netinst="true">
  <variant id="workstation"/>
</media>
or something like that.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20150527/3345a955/attachment.sig>