From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
---
.../ubuntubreezy/ubuntu-5.10-dvd-amd64.iso.txt | 29 +++++++++
.../ubuntubreezy/ubuntu-5.10-dvd-i386.iso.txt | 29 +++++++++
.../ubuntubreezy/ubuntu-5.10-dvd-powerpc.iso.txt | 16 +++++
.../ubuntubreezy/ubuntu-5.10-install-amd64.iso.txt | 29 +++++++++
.../ubuntubreezy/ubuntu-5.10-install-i386.iso.txt | 29 +++++++++
.../ubuntu-5.10-install-powerpc.iso.txt | 16 +++++
.../ubuntubreezy/ubuntu-5.10-live-amd64.iso.txt | 29 +++++++++
.../ubuntubreezy/ubuntu-5.10-live-i386.iso.txt | 29 +++++++++
.../ubuntubreezy/ubuntu-5.10-live-powerpc.iso.txt | 16 +++++
.../ubuntu-6.06-alternate-amd64.iso.txt | 29 +++++++++
.../ubuntu-6.06-alternate-hppa.iso.txt | 16 +++++
.../ubuntu-6.06-alternate-i386.iso.txt | 29 +++++++++
.../ubuntu-6.06-alternate-ia64.iso.txt | 29 +++++++++
.../ubuntu-6.06-alternate-powerpc.iso.txt | 16 +++++
.../ubuntudapper/ubuntu-6.06-desktop-amd64.iso.txt | 29 +++++++++
.../ubuntudapper/ubuntu-6.06-desktop-i386.iso.txt | 29 +++++++++
.../ubuntu-6.06-desktop-powerpc.iso.txt | 16 +++++
.../ubuntudapper/ubuntu-6.06-dvd-amd64.iso.txt | 29 +++++++++
.../ubuntudapper/ubuntu-6.06-dvd-i386.iso.txt | 29 +++++++++
.../ubuntudapper/ubuntu-6.06-dvd-powerpc.iso.txt | 16 +++++
.../ubuntudapper/ubuntu-6.06-server-amd64.iso.txt | 29 +++++++++
.../ubuntudapper/ubuntu-6.06-server-hppa.iso.txt | 16 +++++
.../ubuntudapper/ubuntu-6.06-server-i386.iso.txt | 29 +++++++++
.../ubuntudapper/ubuntu-6.06-server-ia64.iso.txt | 29 +++++++++
.../ubuntu-6.06-server-powerpc.iso.txt | 16 +++++
.../ubuntudapper/ubuntu-6.06-server-sparc.iso.txt | 16 +++++
.../ubuntu-6.06.1-alternate-amd64.iso.txt | 29 +++++++++
.../ubuntu-6.06.1-alternate-hppa.iso.txt | 16 +++++
.../ubuntu-6.06.1-alternate-i386.iso.txt | 29 +++++++++
.../ubuntu-6.06.1-alternate-ia64.iso.txt | 29 +++++++++
.../ubuntu-6.06.1-alternate-powerpc.iso.txt | 16 +++++
.../ubuntu-6.06.1-desktop-amd64.iso.txt | 29 +++++++++
.../ubuntu-6.06.1-desktop-i386.iso.txt | 29 +++++++++
.../ubuntu-6.06.1-desktop-powerpc.iso.txt | 16 +++++
.../ubuntudapper/ubuntu-6.06.1-dvd-amd64.iso.txt | 29 +++++++++
.../ubuntudapper/ubuntu-6.06.1-dvd-i386.iso.txt | 29 +++++++++
.../ubuntudapper/ubuntu-6.06.1-dvd-powerpc.iso.txt | 16 +++++
.../ubuntuhardy/ubuntu-8.04.3-desktop-i386.iso.txt | 29 +++++++++
.../ubuntujaunty/ubuntu-9.04-desktop-i386.iso.txt | 29 +++++++++
.../ubuntujaunty/ubuntu-9.04-server-i386.iso.txt | 29 +++++++++
test/test-isodetect.c | 67 +++++++-------------
41 files changed, 1002 insertions(+), 43 deletions(-)
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-hppa.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-ia64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-hppa.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-ia64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-sparc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-hppa.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-ia64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-amd64.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-powerpc.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntuhardy/ubuntu-8.04.3-desktop-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-desktop-i386.iso.txt
create mode 100644 test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-server-i386.iso.txt
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-amd64.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-amd64.iso.txt
new file mode 100644
index 0000000..c38d5ba
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1501792
+El Torito VD version 1 found, boot catalog is in sector 4596
+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 11F5 4597
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-i386.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-i386.iso.txt
new file mode 100644
index 0000000..1697788
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1488369
+El Torito VD version 1 found, boot catalog is in sector 4609
+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 1202 4610
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-powerpc.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-powerpc.iso.txt
new file mode 100644
index 0000000..24ec84a
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-dvd-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1541526
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-amd64.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-amd64.iso.txt
new file mode 100644
index 0000000..62f1a64
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 328399
+El Torito VD version 1 found, boot catalog is in sector 2584
+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 A19 2585
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-i386.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-i386.iso.txt
new file mode 100644
index 0000000..52aba6a
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 315981
+El Torito VD version 1 found, boot catalog is in sector 2599
+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 A28 2600
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-powerpc.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-powerpc.iso.txt
new file mode 100644
index 0000000..8037e52
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-install-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 329994
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-amd64.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-amd64.iso.txt
new file mode 100644
index 0000000..863ddfa
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 329589
+El Torito VD version 1 found, boot catalog is in sector 343
+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 158 344
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-i386.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-i386.iso.txt
new file mode 100644
index 0000000..969a75b
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 321277
+El Torito VD version 1 found, boot catalog is in sector 344
+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 159 345
diff --git a/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-powerpc.iso.txt b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-powerpc.iso.txt
new file mode 100644
index 0000000..addb6df
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntubreezy/ubuntu-5.10-live-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 5.10 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 321050
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-amd64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-amd64.iso.txt
new file mode 100644
index 0000000..9031287
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 355268
+El Torito VD version 1 found, boot catalog is in sector 2209
+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 89A 2202
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-hppa.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-hppa.iso.txt
new file mode 100644
index 0000000..adf5b44
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-hppa.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 hppa
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 283807
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-i386.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-i386.iso.txt
new file mode 100644
index 0000000..cd2e4de
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 354455
+El Torito VD version 1 found, boot catalog is in sector 2607
+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 A28 2600
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-ia64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-ia64.iso.txt
new file mode 100644
index 0000000..1bc4376
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-ia64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 ia64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 333850
+El Torito VD version 1 found, boot catalog is in sector 1930
+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 FFFF8000
+ Bootoff 78B 1931
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-powerpc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-powerpc.iso.txt
new file mode 100644
index 0000000..e1899e1
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-alternate-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 354228
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-amd64.iso.txt
new file mode 100644
index 0000000..57a0dba
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 357835
+El Torito VD version 1 found, boot catalog is in sector 258
+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 FB 251
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-i386.iso.txt
new file mode 100644
index 0000000..bf2c10c
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 357297
+El Torito VD version 1 found, boot catalog is in sector 258
+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 FB 251
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-powerpc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-powerpc.iso.txt
new file mode 100644
index 0000000..22e1a2e
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-desktop-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 358944
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-amd64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-amd64.iso.txt
new file mode 100644
index 0000000..968a0ab
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1681156
+El Torito VD version 1 found, boot catalog is in sector 4654
+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 1227 4647
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-i386.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-i386.iso.txt
new file mode 100644
index 0000000..f413747
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1646178
+El Torito VD version 1 found, boot catalog is in sector 4683
+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 1244 4676
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-powerpc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-powerpc.iso.txt
new file mode 100644
index 0000000..5c4ffdc
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-dvd-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1738329
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-amd64.iso.txt
new file mode 100644
index 0000000..ddde135
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 6.06 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 219414
+El Torito VD version 1 found, boot catalog is in sector 1266
+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 4EB 1259
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-hppa.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-hppa.iso.txt
new file mode 100644
index 0000000..d961f73
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-hppa.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 6.06 hppa
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 155012
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-i386.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-i386.iso.txt
new file mode 100644
index 0000000..bdcf53f
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 6.06 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 220998
+El Torito VD version 1 found, boot catalog is in sector 1272
+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 4F1 1265
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-ia64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-ia64.iso.txt
new file mode 100644
index 0000000..c61bfa1
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-ia64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 6.06 ia64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 217257
+El Torito VD version 1 found, boot catalog is in sector 1181
+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 FFFF8000
+ Bootoff 49E 1182
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-powerpc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-powerpc.iso.txt
new file mode 100644
index 0000000..7f20afc
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 6.06 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 240006
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-sparc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-sparc.iso.txt
new file mode 100644
index 0000000..0070fe9
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06-server-sparc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 6.06 sparc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 200630
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-amd64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-amd64.iso.txt
new file mode 100644
index 0000000..118a9fa
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 357261
+El Torito VD version 1 found, boot catalog is in sector 2211
+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 89C 2204
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-hppa.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-hppa.iso.txt
new file mode 100644
index 0000000..b3df90e
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-hppa.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 hppa
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 285461
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-i386.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-i386.iso.txt
new file mode 100644
index 0000000..6764fe6
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 356775
+El Torito VD version 1 found, boot catalog is in sector 2609
+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 A2A 2602
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-ia64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-ia64.iso.txt
new file mode 100644
index 0000000..f1fa6de
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-ia64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 ia64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 335518
+El Torito VD version 1 found, boot catalog is in sector 1930
+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 FFFF8000
+ Bootoff 78B 1931
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-powerpc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-powerpc.iso.txt
new file mode 100644
index 0000000..35e88f4
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-alternate-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 355884
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-amd64.iso.txt
new file mode 100644
index 0000000..185738f
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 358277
+El Torito VD version 1 found, boot catalog is in sector 260
+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 FD 253
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-i386.iso.txt
new file mode 100644
index 0000000..dc84eb5
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 357586
+El Torito VD version 1 found, boot catalog is in sector 260
+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 FD 253
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-powerpc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-powerpc.iso.txt
new file mode 100644
index 0000000..bea1bb4
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-desktop-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 357636
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-amd64.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-amd64.iso.txt
new file mode 100644
index 0000000..03ceb64
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 amd64
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1684402
+El Torito VD version 1 found, boot catalog is in sector 4660
+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 122D 4653
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-i386.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-i386.iso.txt
new file mode 100644
index 0000000..37d437d
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 i386
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1649296
+El Torito VD version 1 found, boot catalog is in sector 4689
+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 124A 4682
diff --git a/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-powerpc.iso.txt b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-powerpc.iso.txt
new file mode 100644
index 0000000..c6283a3
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntudapper/ubuntu-6.06.1-dvd-powerpc.iso.txt
@@ -0,0 +1,16 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 6.06.1 ppc
+Volume set id:
+Publisher id:
+Data preparer id:
+Application id: MKISOFS ISO 9660/HFS FILESYSTEM BUILDER & CDRECORD CD-R/DVD CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING
+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: 1739922
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/test/isodata/ubuntu/ubuntuhardy/ubuntu-8.04.3-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntuhardy/ubuntu-8.04.3-desktop-i386.iso.txt
new file mode 100644
index 0000000..9d880d0
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntuhardy/ubuntu-8.04.3-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 8.04.3 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: 357539
+El Torito VD version 1 found, boot catalog is in sector 162
+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 9B 155
diff --git a/test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-desktop-i386.iso.txt
new file mode 100644
index 0000000..23f5e99
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu 9.04 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: 357866
+El Torito VD version 1 found, boot catalog is in sector 145
+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 89 137
diff --git a/test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-server-i386.iso.txt b/test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-server-i386.iso.txt
new file mode 100644
index 0000000..005da6d
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntujaunty/ubuntu-9.04-server-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Ubuntu-Server 9.04 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: 295534
+El Torito VD version 1 found, boot catalog is in sector 1574
+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 61E 1566
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 2f88083..b342167 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -45,8 +45,15 @@ static struct ISOInfo *load_iso(GFile *file, const gchar *shortid, const gchar *
strstr(name, "i686") ||
strstr(name, "x86"))
arch = "i386";
- else if (strstr(name, "ppc"))
+ else if (strstr(name, "ppc") ||
+ strstr(name, "powerpc"))
arch = "ppc";
+ else if (strstr(name, "hppa"))
+ arch = "hppa";
+ else if (strstr(name, "sparc"))
+ arch = "sparc";
+ else if (strstr(name, "ia64"))
+ arch = "ia64";
else {
g_warning("Unknown arch in %s", name);
arch = "i386";
@@ -200,7 +207,7 @@ static GList *load_isos(const gchar *vendor, GError **error)
}
-START_TEST(test_fedora)
+static void test_one(const gchar *vendor)
{
OsinfoLoader *loader = osinfo_loader_new();
OsinfoDb *db = osinfo_loader_get_db(loader);
@@ -214,7 +221,7 @@ START_TEST(test_fedora)
osinfo_loader_process_path(loader, SRCDIR "/data", &error);
fail_unless(error == NULL, error ? error->message : "none");
- isos = load_isos("fedora", &error);
+ isos = load_isos(vendor, &error);
fail_unless(isos != NULL, "ISOs must not be NULL");
@@ -240,53 +247,26 @@ START_TEST(test_fedora)
g_list_foreach(isos, (GFunc)free_iso, NULL);
g_list_free(isos);
- g_object_unref(db);
+ g_object_unref(loader);
}
-END_TEST
-
-
-START_TEST(test_windows)
+START_TEST(test_fedora)
{
- OsinfoLoader *loader = osinfo_loader_new();
- OsinfoDb *db = osinfo_loader_get_db(loader);
- GList *isos = NULL;
- GList *tmp;
- GError *error = NULL;
-
- fail_unless(OSINFO_IS_LOADER(loader), "Loader is not a LOADER");
- fail_unless(OSINFO_IS_DB(db), "Db is not a DB");
-
- osinfo_loader_process_path(loader, SRCDIR "/data", &error);
- fail_unless(error == NULL, error ? error->message : "none");
-
- isos = load_isos("windows", &error);
-
- fail_unless(isos != NULL, "ISOs must not be NULL %s", error ? error->message : "unknown");
-
- tmp = isos;
- while (tmp) {
- struct ISOInfo *info = tmp->data;
- OsinfoMedia *media = NULL;
- OsinfoOs *os = osinfo_db_guess_os_from_media(db,
- info->media,
- &media);
-
- fail_unless(os != NULL, "ISO %s matched OS %s",
- info->filename, info->shortid);
+ test_one("fedora");
+}
+END_TEST
- const gchar *shortid = osinfo_product_get_short_id(OSINFO_PRODUCT(os));
- fail_unless(g_str_equal(shortid, info->shortid),
- "ISO %s matched OS %s, not %s",
- info->filename, info->shortid, shortid);
- tmp = tmp->next;
- }
+START_TEST(test_ubuntu)
+{
+ test_one("ubuntu");
+}
+END_TEST
- g_list_foreach(isos, (GFunc)free_iso, NULL);
- g_list_free(isos);
- g_object_unref(db);
+START_TEST(test_windows)
+{
+ test_one("windows");
}
END_TEST
@@ -300,6 +280,7 @@ list_suite(void)
tcase_set_timeout(tc, 20);
tcase_add_test(tc, test_fedora);
+ tcase_add_test(tc, test_ubuntu);
tcase_add_test(tc, test_windows);
suite_add_tcase(s, tc);
return s;
--
1.7.7.6
