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>
+ <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"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/i386/iso/Fedora-Workstation-netinst-i386-22.iso</url>
+ <iso>
+ <volume-id>Fedora-22-i386</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>534521856</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <variant id="workstation-netinst"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Workstation/x86_64/iso/Fedora-Workstation-netinst-x86_64-22.iso</url>
+ <iso>
+ <volume-id>Fedora-22-x86_64</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>468690944</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Server -->
+
+ <!-- DVD -->
+ <media arch="i686">
+ <variant id="server"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-DVD-i386-22.iso</url>
+ <iso>
+ <volume-id>Fedora-22-i386</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>2334973952</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <variant id="server"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-DVD-x86_64-22.iso</url>
+ <iso>
+ <volume-id>Fedora-22-x86_64</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>2216890368</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <!-- Network Installer !-->
+ <media arch="i686">
+ <variant id="server-netinst"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/iso/Fedora-Server-netinst-i386-22.iso</url>
+ <iso>
+ <volume-id>Fedora-22-i386</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>534495232</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+ <media arch="x86_64">
+ <variant id="server-netinst"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/iso/Fedora-Server-netinst-x86_64-22.iso</url>
+ <iso>
+ <volume-id>Fedora-22-x86_64</volume-id>
+ <system-id>LINUX</system-id>
+ <volume-size>468740096</volume-size>
+ </iso>
+ <kernel>isolinux/vmlinuz</kernel>
+ <initrd>isolinux/initrd.img</initrd>
+ </media>
+
+ <tree arch="i686">
+ <variant id="server"/>
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/i386/os/</url>
+ <treeinfo>
+ <family>Fedora</family>
+ <version>22</version>
+ <arch>i386</arch>
+ </treeinfo>
+ </tree>
+ <tree arch="x86_64">
+ <url>http://download.fedoraproject.org/pub/fedora/linux/releases/22/Server/x86_64/os/</url>
+ <variant id="server"/>
+ <treeinfo>
+ <family>Fedora</family>
+ <version>22</version>
+ <arch>x86_64</arch>
+ </treeinfo>
+ </tree>
+
+ <!-- No install media or tree is provided for Fedora 22 Cloud variant -->
+
+ <resources arch="all">
+ <minimum>
+ <n-cpus>1</n-cpus>
+ <cpu>1000000000</cpu>
+ <ram>1073741824</ram>
+ <storage>10737418240</storage>
+ </minimum>
+
+ <recommended>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
+ </resources>
+
+ <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
@@ -4092,8 +4257,8 @@
<_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"/>
+ <upgrades id="http://fedoraproject.org/fedora/22"/>
+ <derives-from id="http://fedoraproject.org/fedora/22"/>
<release-status>prerelease</release-status>
<media arch="i686">
@@ -4131,6 +4296,11 @@
<ram>1073741824</ram>
<storage>10737418240</storage>
</minimum>
+
+ <recommended>
+ <ram>2147483648</ram>
+ <storage>21474836480</storage>
+ </recommended>
</resources>
</os>
diff --git a/test/isodata/fedora/fedora22/Fedora-Live-Workstation-i686-22-3.iso.txt b/test/isodata/fedora/fedora22/Fedora-Live-Workstation-i686-22-3.iso.txt
new file mode 100644
index 0000000..926a70f
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Live-Workstation-i686-22-3.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-Live-WS-i686-22-3
+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: 682774
+El Torito VD version 1 found, boot catalog is in sector 36
+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 25 37
diff --git a/test/isodata/fedora/fedora22/Fedora-Live-Workstation-x86_64-22-3.iso.txt b/test/isodata/fedora/fedora22/Fedora-Live-Workstation-x86_64-22-3.iso.txt
new file mode 100644
index 0000000..d0dd2c8
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Live-Workstation-x86_64-22-3.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-Live-WS-x86_64-22-3
+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: 698586
+El Torito VD version 1 found, boot catalog is in sector 42
+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 A11 2577
diff --git a/test/isodata/fedora/fedora22/Fedora-Server-DVD-i386-22.iso.txt b/test/isodata/fedora/fedora22/Fedora-Server-DVD-i386-22.iso.txt
new file mode 100644
index 0000000..af40ca2
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Server-DVD-i386-22.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-22-i386
+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: 1140124
+El Torito VD version 1 found, boot catalog is in sector 434
+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 1B3 435
diff --git a/test/isodata/fedora/fedora22/Fedora-Server-DVD-x86_64-22.iso.txt b/test/isodata/fedora/fedora22/Fedora-Server-DVD-x86_64-22.iso.txt
new file mode 100644
index 0000000..2d554e0
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Server-DVD-x86_64-22.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-22-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: 1082466
+El Torito VD version 1 found, boot catalog is in sector 447
+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 1C0 448
diff --git a/test/isodata/fedora/fedora22/Fedora-Server-netinst-i386-22.iso.txt b/test/isodata/fedora/fedora22/Fedora-Server-netinst-i386-22.iso.txt
new file mode 100644
index 0000000..b9ec76d
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Server-netinst-i386-22.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-22-i386
+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: 260984
+El Torito VD version 1 found, boot catalog is in sector 41
+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 5320 21280
diff --git a/test/isodata/fedora/fedora22/Fedora-Server-netinst-x86_64-22.iso.txt b/test/isodata/fedora/fedora22/Fedora-Server-netinst-x86_64-22.iso.txt
new file mode 100644
index 0000000..8c79fe6
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Server-netinst-x86_64-22.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-22-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: 228877
+El Torito VD version 1 found, boot catalog is in sector 47
+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 5552 21842
diff --git a/test/isodata/fedora/fedora22/Fedora-Workstation-netinst-i386-22.iso.txt b/test/isodata/fedora/fedora22/Fedora-Workstation-netinst-i386-22.iso.txt
new file mode 100644
index 0000000..d7955f8
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Workstation-netinst-i386-22.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-22-i386
+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: 260997
+El Torito VD version 1 found, boot catalog is in sector 41
+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 5320 21280
diff --git a/test/isodata/fedora/fedora22/Fedora-Workstation-netinst-x86_64-22.iso.txt b/test/isodata/fedora/fedora22/Fedora-Workstation-netinst-x86_64-22.iso.txt
new file mode 100644
index 0000000..0952ef5
--- /dev/null
+++ b/test/isodata/fedora/fedora22/Fedora-Workstation-netinst-x86_64-22.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Fedora-22-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: 228853
+El Torito VD version 1 found, boot catalog is in sector 47
+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 5553 21843
--
2.1.0
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
