From 3dcfa43b221b9e5a04878a37f91727696deadd57 Mon Sep 17 00:00:00 2001
From: Satoru Satoh <ssato@redhat.com>
Date: Thu, 6 Nov 2014 15:33:27 +0100
Subject: [PATCH] Add rhel-5.9..11 and rhel-6.6 info

---
 data/oses/rhel.xml.in                              | 133 +++++++++++++++++++++
 .../rhel5.10/rhel-server-5.10-i386-dvd.iso.txt     |  29 +++++
 .../rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt   |  29 +++++
 .../rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt   |  29 +++++
 .../rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt  |  29 +++++
 .../rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt     |  29 +++++
 .../rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt     |  29 +++++
 7 files changed, 307 insertions(+)
 create mode 100644 test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt
 create mode 100644 test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt

diff --git a/data/oses/rhel.xml.in b/data/oses/rhel.xml.in
index 9b5f6bb..921396a 100644
--- a/data/oses/rhel.xml.in
+++ b/data/oses/rhel.xml.in
@@ -658,6 +658,89 @@
     </media>
   </os>
 
+  <os id="http://redhat.com/rhel/5.9">
+    <short-id>rhel5.9</short-id>
+    <_name>Red Hat Enterprise Linux 5.9</_name>
+    <version>5.9</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.8"/>
+    <derives-from id="http://redhat.com/rhel/5.8"/>
+
+    <release-date>2013-01-07</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.9 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.9 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.10">
+    <short-id>rhel5.10</short-id>
+    <_name>Red Hat Enterprise Linux 5.10</_name>
+    <version>5.10</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.9"/>
+    <derives-from id="http://redhat.com/rhel/5.9"/>
+
+    <release-date>2013-10-01</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.10 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.10 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://redhat.com/rhel/5.11">
+    <short-id>rhel5.11</short-id>
+    <_name>Red Hat Enterprise Linux 5.11</_name>
+    <version>5.11</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Tikanga</codename>
+    <upgrades id="http://redhat.com/rhel/5.10"/>
+    <derives-from id="http://redhat.com/rhel/5.10"/>
+
+    <release-date>2014-09-16</release-date>
+    <eol-date>2020-03-31</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.11 i386.*</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL/5.11 x86_64.*</volume-id>
+      </iso>
+    </media>
+  </os>
 
   <!-- RHEL-6 Santiago -->
 
@@ -965,6 +1048,56 @@
     </installer>
   </os>
 
+  <os id="http://redhat.com/rhel/6.6">
+    <short-id>rhel6.6</short-id>
+    <_name>Red Hat Enterprise Linux 6.6</_name>
+    <version>6.6</version>
+    <_vendor>Red Hat, Inc</_vendor>
+    <family>linux</family>
+    <distro>rhel</distro>
+    <codename>Santiago</codename>
+    <upgrades id="http://redhat.com/rhel/6.5"/>
+    <derives-from id="http://redhat.com/rhel/6.5"/>
+
+    <release-date>2014-10-14</release-date>
+    <eol-date>2023-11-30</eol-date>
+
+    <media arch="i686">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>RHEL-6.6 .*.i386.*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>.*RHEL-6.6 .*.x86_64.*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz</kernel>
+      <initrd>isolinux/initrd.img</initrd>
+    </media>
+
+    <resources arch="all">
+      <minimum>
+        <n-cpus>1</n-cpus>
+        <ram>536870912</ram>
+      </minimum>
+
+      <recommended>
+        <cpu>400000000</cpu>
+        <ram>1073741824</ram>
+        <storage>9663676416</storage>
+      </recommended>
+    </resources>
+
+    <installer>
+      <script id='http://redhat.com/scripts/rhel/jeos'/>
+      <script id='http://redhat.com/scripts/rhel/desktop'/>
+    </installer>
+  </os>
+
   <!-- If you add a new 6.x entry here, please don't forget to update the
        'upgrades' node under 'rhel7.0' entry below. -->
 
diff --git a/test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt b/test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt
new file mode 100644
index 0000000..735a453
--- /dev/null
+++ b/test/isodata/rhel/rhel5.10/rhel-server-5.10-i386-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL/5.10 i386 DVD
+Volume set id: RHEL/5.10 i386
+Publisher id: 
+Data preparer id: 
+Application id: RHEL/5.10 i386
+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: 1830701
+El Torito VD version 1 found, boot catalog is in sector 429
+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 1AE 430
diff --git a/test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..21551cf
--- /dev/null
+++ b/test/isodata/rhel/rhel5.10/rhel-server-5.10-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL/5.10 x86_64 DVD
+Volume set id: RHEL/5.10 x86_64
+Publisher id: 
+Data preparer id: 
+Application id: RHEL/5.10 x86_64
+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: 2137751
+El Torito VD version 1 found, boot catalog is in sector 553
+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 22A 554
diff --git a/test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..58cde74
--- /dev/null
+++ b/test/isodata/rhel/rhel5.11/rhel-server-5.11-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL/5.11 x86_64 DVD
+Volume set id: RHEL/5.11 x86_64
+Publisher id: 
+Data preparer id: 
+Application id: RHEL/5.11 x86_64
+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: 2170464
+El Torito VD version 1 found, boot catalog is in sector 554
+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 22B 555
diff --git a/test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt b/test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt
new file mode 100644
index 0000000..d83edc9
--- /dev/null
+++ b/test/isodata/rhel/rhel5.9/rhel-server-5.9-i386-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL/5.9 i386 DVD
+Volume set id: RHEL/5.9 i386
+Publisher id: 
+Data preparer id: 
+Application id: RHEL/5.9 i386
+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: 1796811
+El Torito VD version 1 found, boot catalog is in sector 426
+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 1AB 427
diff --git a/test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..54f4374
--- /dev/null
+++ b/test/isodata/rhel/rhel5.9/rhel-server-5.9-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL/5.9 x86_64 DVD
+Volume set id: RHEL/5.9 x86_64
+Publisher id: 
+Data preparer id: 
+Application id: RHEL/5.9 x86_64
+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: 2098662
+El Torito VD version 1 found, boot catalog is in sector 549
+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 226 550
diff --git a/test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt b/test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt
new file mode 100644
index 0000000..90222af
--- /dev/null
+++ b/test/isodata/rhel/rhel6.6/rhel-server-6.6-x86_64-dvd.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: RHEL-6.6 Server.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: 1846398
+El Torito VD version 1 found, boot catalog is in sector 990
+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 1CD6D 118125
-- 
2.1.0