From: Fabiano Fidêncio <fidencio@xxxxxxxxxx> --- data/oses/debian.xml.in | 43 ++++++++++++++++++++-- .../debian7/debian-7.0.0-amd64-DVD-1.iso.txt | 29 +++++++++++++++ .../debian/debian7/debian-7.0.0-i386-DVD-1.iso.txt | 29 +++++++++++++++ 3 files changed, 97 insertions(+), 4 deletions(-) create mode 100644 test/isodata/debian/debian7/debian-7.0.0-amd64-DVD-1.iso.txt create mode 100644 test/isodata/debian/debian7/debian-7.0.0-i386-DVD-1.iso.txt diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index c30fb37..a717ad3 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -204,15 +204,50 @@ </media> </os> -<!-- Wheezy isn't released yet - <os id="http://debian.org/wheezy"> + <os id="http://debian.org/debian/7"> + <short-id>debian7</short-id> <short-id>debianwheezy</short-id> <_name>Debian Wheezy</_name> <version>7</version> <_vendor>Debian Project</_vendor> <family>linux</family> - <upgrades id="http://debian.org/squeeze"/> + <upgrades id="http://debian.org/debian/6"/> + <derives-from id="http://debian.org/debian/6"/> + + <devices> + <device id="http://www.linux-usb.org/usb.ids/80ee/0021"/> + </devices> + + <resources arch="all"> + <minimum> + <cpu>1000000000</cpu> + <n-cpus>1</n-cpus> + <ram>134217728</ram> + <storage>5368709120</storage> + </minimum> + <recommended> + <cpu>1000000000</cpu> + <ram>536870912</ram> + <storage>5368709120</storage> + </recommended> + </resources> + + <media arch="i686"> + <url>http://cdimage.debian.org/debian-cd/7.0.0/i386/iso-dvd/debian-7.0.0-i386-DVD-1.iso</url> + <iso> + <volume-id>Debian 7.0.\d i386 1</volume-id> + </iso> + <kernel>install.386/vmlinuz</kernel> + <initrd>install.386/initrd.gz</initrd> + </media> + <media arch="x86_64"> + <url>http://cdimage.debian.org/debian-cd/7.0.0/amd64/iso-dvd/debian-7.0.0-amd64-DVD-1.iso</url> + <iso> + <volume-id>Debian 7.0.\d amd64 1</volume-id> + </iso> + <kernel>install.amd/vmlinuz</kernel> + <initrd>install.amd/initrd.gz</initrd> + </media> </os> ---> </libosinfo> diff --git a/test/isodata/debian/debian7/debian-7.0.0-amd64-DVD-1.iso.txt b/test/isodata/debian/debian7/debian-7.0.0-amd64-DVD-1.iso.txt new file mode 100644 index 0000000..750a470 --- /dev/null +++ b/test/isodata/debian/debian7/debian-7.0.0-amd64-DVD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 7.0.0 amd64 1 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.2.6 2013.01.08.103001, LIBISOBURN-1.2.6, LIBISOFS-1.2.6, LIBBURN-1.2.6 +Application id: +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: 1952152 +El Torito VD version 1 found, boot catalog is in sector 4647 +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 6B88B 440459 diff --git a/test/isodata/debian/debian7/debian-7.0.0-i386-DVD-1.iso.txt b/test/isodata/debian/debian7/debian-7.0.0-i386-DVD-1.iso.txt new file mode 100644 index 0000000..ae715d7 --- /dev/null +++ b/test/isodata/debian/debian7/debian-7.0.0-i386-DVD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 7.0.0 i386 1 +Volume set id: +Publisher id: +Data preparer id: XORRISO-1.2.6 2013.01.08.103001, LIBISOBURN-1.2.6, LIBISOFS-1.2.6, LIBBURN-1.2.6 +Application id: +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: 1952152 +El Torito VD version 1 found, boot catalog is in sector 9052 +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 1510E3 1380579 -- 1.8.2.1 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo