<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Mar 25, 2013 at 9:50 AM, Christophe Fergeau <span dir="ltr"><<a href="mailto:cfergeau@redhat.com" target="_blank">cfergeau@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Sat, Mar 23, 2013 at 03:09:26PM +0100, Fabiano Fidêncio wrote:<br>
> ---<br>
> data/oses/<a href="http://centos.xml.in" target="_blank">centos.xml.in</a> | 22 ++++++++++++++++<br>
> .../centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt | 29 ++++++++++++++++++++++<br>
> .../centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt | 29 ++++++++++++++++++++++<br>
> test/test-isodetect.c | 6 +++++<br>
> 4 files changed, 86 insertions(+)<br>
> create mode 100644 test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt<br>
> create mode 100644 test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt<br>
><br>
> diff --git a/data/oses/<a href="http://centos.xml.in" target="_blank">centos.xml.in</a> b/data/oses/<a href="http://centos.xml.in" target="_blank">centos.xml.in</a><br>
> index 3f09dea..bb8e570 100644<br>
> --- a/data/oses/<a href="http://centos.xml.in" target="_blank">centos.xml.in</a><br>
> +++ b/data/oses/<a href="http://centos.xml.in" target="_blank">centos.xml.in</a><br>
> @@ -16,13 +16,35 @@<br>
> <system-id>LINUX</system-id><br>
> <volume-id>CentOS_6.0_Final</volume-id><br>
> </iso><br>
> + <kernel>isolinux/vmlinuz</kernel><br>
> + <initrd>isolinux/initrd.img</initrd><br>
> </media><br>
> <media arch="x86_64"><br>
> <iso><br>
> <system-id>LINUX</system-id><br>
> <volume-id>CentOS_6.0_Final</volume-id><br>
> </iso><br>
> + <kernel>isolinux/vmlinuz</kernel><br>
> + <initrd>isolinux/initrd.img</initrd><br>
> </media><br>
> +<br>
> + <resources arch="all"><br>
> + <minimum><br>
> + <n-cpus>1</n-cpus><br>
> + <ram>536870912</ram><br>
> + </minimum><br>
> +<br>
> + <recommended><br>
> + <cpu>400000000</cpu><br>
> + <ram>1073741824</ram><br>
> + <storage>9663676416</storage><br>
> + </recommended><br>
> + </resources><br>
> +<br>
> + <installer><br>
> + <script id='<a href="http://redhat.com/scripts/rhel/jeos'/" target="_blank">http://redhat.com/scripts/rhel/jeos'/</a>><br>
> + <script id='<a href="http://redhat.com/scripts/rhel/desktop'/" target="_blank">http://redhat.com/scripts/rhel/desktop'/</a>><br>
> + </installer><br>
<br>
</div></div>This gets back to a question I had while I was writing the openSUSE<br>
patches, should we be duplicating this info, or should this be inherited<br>
through the clones/derives-from elements if it's not set?<br></blockquote><div><br></div><div>IMHO, this info should be inherited through the clones/derives-from elements.<br></div><div>Should I change it? :-)<br></div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Patch looks good apart from this.<br>
<span class="HOEnZb"><font color="#888888"><br>
Christophe<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
> </os><br>
><br>
> <os id="<a href="http://centos.org/centos/6.1" target="_blank">http://centos.org/centos/6.1</a>"><br>
> diff --git a/test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt b/test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt<br>
> new file mode 100644<br>
> index 0000000..3109c60<br>
> --- /dev/null<br>
> +++ b/test/isodata/centos/centos6.0/CentOS-6.0-i386-bin-DVD.iso.txt<br>
> @@ -0,0 +1,29 @@<br>
> +CD-ROM is in ISO 9660 format<br>
> +System id: LINUX<br>
> +Volume id: CentOS_6.0_Final<br>
> +Volume set id:<br>
> +Publisher id: CentOS Project<br>
> +Data preparer id: CentOS<br>
> +Application id: CentOS_6.0_Final<br>
> +Copyright File id:<br>
> +Abstract File id:<br>
> +Bibliographic File id:<br>
> +Volume set size is: 1<br>
> +Volume set sequence number is: 1<br>
> +Logical block size is: 2048<br>
> +Volume size is: 2297586<br>
> +El Torito VD version 1 found, boot catalog is in sector 655<br>
> +Joliet with UCS level 3 found<br>
> +Rock Ridge signatures version 1 found<br>
> +Eltorito validation header:<br>
> + Hid 1<br>
> + Arch 0 (x86)<br>
> + ID 'CentOS Project'<br>
> + Key 55 AA<br>
> + Eltorito defaultboot header:<br>
> + Bootid 88 (bootable)<br>
> + Boot media 0 (No Emulation Boot)<br>
> + Load segment 0<br>
> + Sys type 0<br>
> + Nsect 4<br>
> + Bootoff 290 656<br>
> diff --git a/test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt b/test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt<br>
> new file mode 100644<br>
> index 0000000..3cd3e6e<br>
> --- /dev/null<br>
> +++ b/test/isodata/centos/centos6.0/CentOS-6.0-x86_64-bin-DVD1.iso.txt<br>
> @@ -0,0 +1,29 @@<br>
> +CD-ROM is in ISO 9660 format<br>
> +System id: LINUX<br>
> +Volume id: CentOS_6.0_Final<br>
> +Volume set id:<br>
> +Publisher id: CentOS Project<br>
> +Data preparer id: CentOS<br>
> +Application id: CentOS_6.0_Final<br>
> +Copyright File id:<br>
> +Abstract File id:<br>
> +Bibliographic File id:<br>
> +Volume set size is: 1<br>
> +Volume set sequence number is: 1<br>
> +Logical block size is: 2048<br>
> +Volume size is: 2069727<br>
> +El Torito VD version 1 found, boot catalog is in sector 545<br>
> +Joliet with UCS level 3 found<br>
> +Rock Ridge signatures version 1 found<br>
> +Eltorito validation header:<br>
> + Hid 1<br>
> + Arch 0 (x86)<br>
> + ID 'CentOS Project'<br>
> + Key 55 AA<br>
> + Eltorito defaultboot header:<br>
> + Bootid 88 (bootable)<br>
> + Boot media 0 (No Emulation Boot)<br>
> + Load segment 0<br>
> + Sys type 0<br>
> + Nsect 4<br>
> + Bootoff 222 546<br>
> diff --git a/test/test-isodetect.c b/test/test-isodetect.c<br>
> index 7a1fb06..8a982d4 100644<br>
> --- a/test/test-isodetect.c<br>
> +++ b/test/test-isodetect.c<br>
> @@ -384,6 +384,11 @@ START_TEST(test_opensuse)<br>
> }<br>
> END_TEST<br>
><br>
> +START_TEST(test_centos)<br>
> +{<br>
> + test_one("centos");<br>
> +}<br>
> +END_TEST<br>
><br>
> static Suite *<br>
> list_suite(void)<br>
> @@ -399,6 +404,7 @@ list_suite(void)<br>
> tcase_add_test(tc, test_windows);<br>
> tcase_add_test(tc, test_openbsd);<br>
> tcase_add_test(tc, test_opensuse);<br>
> + tcase_add_test(tc, test_centos);<br>
> suite_add_tcase(s, tc);<br>
> return s;<br>
> }<br>
> --<br>
> 1.8.1.4<br>
><br>
> _______________________________________________<br>
> Libosinfo mailing list<br>
> <a href="mailto:Libosinfo@redhat.com">Libosinfo@redhat.com</a><br>
> <a href="https://www.redhat.com/mailman/listinfo/libosinfo" target="_blank">https://www.redhat.com/mailman/listinfo/libosinfo</a><br>
</div></div><br>_______________________________________________<br>
Libosinfo mailing list<br>
<a href="mailto:Libosinfo@redhat.com">Libosinfo@redhat.com</a><br>
<a href="https://www.redhat.com/mailman/listinfo/libosinfo" target="_blank">https://www.redhat.com/mailman/listinfo/libosinfo</a><br>
<br></blockquote></div><br><br clear="all"><br>-- <br><div>Fabiano Fidêncio</div>
</div></div>