From a03bd1c17a453a47720e8da3423b46cdf8b1ae2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sun, 1 Dec 2013 03:09:31 +0100 Subject: debian: fix ISO's recogntion for debian7 Debian 7 is using 7.\d.\d format of ISOs instead of the usual 7.0.\d --- data/oses/debian.xml.in | 4 +-- .../debian7/debian-7.2.0-amd64-DVD-1.iso.txt | 29 ++++++++++++++++++++++ .../debian/debian7/debian-7.2.0-i386-DVD-1.iso.txt | 29 ++++++++++++++++++++++ .../debian7/debian-7.3.0-amd64-DVD-1.iso.txt | 29 ++++++++++++++++++++++ .../debian/debian7/debian-7.3.0-i386-DVD-1.iso.txt | 29 ++++++++++++++++++++++ 5 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 test/isodata/debian/debian7/debian-7.2.0-amd64-DVD-1.iso.txt create mode 100644 test/isodata/debian/debian7/debian-7.2.0-i386-DVD-1.iso.txt create mode 100644 test/isodata/debian/debian7/debian-7.3.0-amd64-DVD-1.iso.txt create mode 100644 test/isodata/debian/debian7/debian-7.3.0-i386-DVD-1.iso.txt diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in index 02110f7..7009e99 100644 --- a/data/oses/debian.xml.in +++ b/data/oses/debian.xml.in @@ -235,7 +235,7 @@ http://cdimage.debian.org/debian-cd/7.0.0/i386/iso-dvd/debian-7.0.0-i386-DVD-1.iso - Debian 7.0.\d i386 1 + Debian 7.\d.\d i386 1 install.386/vmlinuz install.386/initrd.gz @@ -243,7 +243,7 @@ http://cdimage.debian.org/debian-cd/7.0.0/amd64/iso-dvd/debian-7.0.0-amd64-DVD-1.iso - Debian 7.0.\d amd64 1 + Debian 7.\d.\d amd64 1 install.amd/vmlinuz install.amd/initrd.gz diff --git a/test/isodata/debian/debian7/debian-7.2.0-amd64-DVD-1.iso.txt b/test/isodata/debian/debian7/debian-7.2.0-amd64-DVD-1.iso.txt new file mode 100644 index 0000000..2a990e6 --- /dev/null +++ b/test/isodata/debian/debian7/debian-7.2.0-amd64-DVD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 7.2.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: 1921360 +El Torito VD version 1 found, boot catalog is in sector 4528 +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 15F4E1 1438945 diff --git a/test/isodata/debian/debian7/debian-7.2.0-i386-DVD-1.iso.txt b/test/isodata/debian/debian7/debian-7.2.0-i386-DVD-1.iso.txt new file mode 100644 index 0000000..2a4cb9d --- /dev/null +++ b/test/isodata/debian/debian7/debian-7.2.0-i386-DVD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 7.2.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 9014 +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 F6650 1009232 diff --git a/test/isodata/debian/debian7/debian-7.3.0-amd64-DVD-1.iso.txt b/test/isodata/debian/debian7/debian-7.3.0-amd64-DVD-1.iso.txt new file mode 100644 index 0000000..b5ae014 --- /dev/null +++ b/test/isodata/debian/debian7/debian-7.3.0-amd64-DVD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 7.3.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: 1925120 +El Torito VD version 1 found, boot catalog is in sector 4558 +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 1C8041 1867841 diff --git a/test/isodata/debian/debian7/debian-7.3.0-i386-DVD-1.iso.txt b/test/isodata/debian/debian7/debian-7.3.0-i386-DVD-1.iso.txt new file mode 100644 index 0000000..cf13727 --- /dev/null +++ b/test/isodata/debian/debian7/debian-7.3.0-i386-DVD-1.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: Debian 7.3.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: 1949696 +El Torito VD version 1 found, boot catalog is in sector 9034 +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 19CF1E 1691422 -- cgit v1.2.1