[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[virt-tools-list] [PATCH libosinfo] Import OpenBSD ISO data



From: "Daniel P. Berrange" <berrange redhat com>

---
 data/oses/bsd.xml                                  |   12 --
 data/oses/openbsd.xml                              |  203 ++++++++++++++++++++
 .../openbsd/openbsd42/openbsd-4.2-amd64.txt        |   29 +++
 .../isodata/openbsd/openbsd42/openbsd-4.2-i386.txt |   29 +++
 .../openbsd/openbsd43/openbsd-4.3-amd64.txt        |   29 +++
 .../isodata/openbsd/openbsd43/openbsd-4.3-i386.txt |   29 +++
 .../openbsd/openbsd44/openbsd-4.4-amd64.txt        |   29 +++
 .../isodata/openbsd/openbsd44/openbsd-4.4-i386.txt |   29 +++
 .../openbsd/openbsd45/openbsd-4.5-amd64.txt        |   29 +++
 .../isodata/openbsd/openbsd45/openbsd-4.5-i386.txt |   29 +++
 .../openbsd/openbsd48/openbsd-4.8-amd64.txt        |   29 +++
 .../isodata/openbsd/openbsd48/openbsd-4.8-i386.txt |   29 +++
 .../openbsd/openbsd49/openbsd-4.9-amd64.txt        |   29 +++
 .../isodata/openbsd/openbsd49/openbsd-4.9-i386.txt |   29 +++
 .../openbsd/openbsd50/openbsd-5.0-amd64.txt        |   29 +++
 .../isodata/openbsd/openbsd50/openbsd-5.0-i386.txt |   29 +++
 test/test-isodetect.c                              |    9 +-
 17 files changed, 617 insertions(+), 13 deletions(-)
 create mode 100644 data/oses/openbsd.xml
 create mode 100644 test/isodata/openbsd/openbsd42/openbsd-4.2-amd64.txt
 create mode 100644 test/isodata/openbsd/openbsd42/openbsd-4.2-i386.txt
 create mode 100644 test/isodata/openbsd/openbsd43/openbsd-4.3-amd64.txt
 create mode 100644 test/isodata/openbsd/openbsd43/openbsd-4.3-i386.txt
 create mode 100644 test/isodata/openbsd/openbsd44/openbsd-4.4-amd64.txt
 create mode 100644 test/isodata/openbsd/openbsd44/openbsd-4.4-i386.txt
 create mode 100644 test/isodata/openbsd/openbsd45/openbsd-4.5-amd64.txt
 create mode 100644 test/isodata/openbsd/openbsd45/openbsd-4.5-i386.txt
 create mode 100644 test/isodata/openbsd/openbsd48/openbsd-4.8-amd64.txt
 create mode 100644 test/isodata/openbsd/openbsd48/openbsd-4.8-i386.txt
 create mode 100644 test/isodata/openbsd/openbsd49/openbsd-4.9-amd64.txt
 create mode 100644 test/isodata/openbsd/openbsd49/openbsd-4.9-i386.txt
 create mode 100644 test/isodata/openbsd/openbsd50/openbsd-5.0-amd64.txt
 create mode 100644 test/isodata/openbsd/openbsd50/openbsd-5.0-i386.txt

diff --git a/data/oses/bsd.xml b/data/oses/bsd.xml
index 06495d3..5a82689 100644
--- a/data/oses/bsd.xml
+++ b/data/oses/bsd.xml
@@ -37,16 +37,4 @@
     </devices>
   </os>
 
-  <os id="http://openbsd.org/openbsd4";>
-    <short-id>openbsd4</short-id>
-    <name>OpenBSD 4</name>
-    <version>4.9</version>
-    <family>UNIX</family>
-    <vendor>OpenBSD Project</vendor>
-
-    <devices>
-      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
-    </devices>
-  </os>
-
 </libosinfo>
diff --git a/data/oses/openbsd.xml b/data/oses/openbsd.xml
new file mode 100644
index 0000000..b048794
--- /dev/null
+++ b/data/oses/openbsd.xml
@@ -0,0 +1,203 @@
+<libosinfo version="0.0.1">
+
+  <os id="http://openbsd.org/openbsd/4.2";>
+    <short-id>openbsd42</short-id>
+    <name>OpenBSD 4.2</name>
+    <version>4.2</version>
+    <family>BSD</family>
+    <vendor>OpenBSD Project</vendor>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.2 Install CD</volume-id>
+	<application-id>OpenBSD 4.2 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.3";>
+    <short-id>openbsd43</short-id>
+    <name>OpenBSD 4.3</name>
+    <version>4.3</version>
+    <family>BSD</family>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.2'/>
+    <derives-from id='http://openbsd.org/openbsd/4.2'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.3 Install CD</volume-id>
+	<application-id>OpenBSD 4.3 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.4";>
+    <short-id>openbsd44</short-id>
+    <name>OpenBSD 4.4</name>
+    <version>4.4</version>
+    <family>BSD</family>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.3'/>
+    <derives-from id='http://openbsd.org/openbsd/4.3'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.4 Install CD</volume-id>
+	<application-id>OpenBSD 4.4 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.5";>
+    <short-id>openbsd45</short-id>
+    <name>OpenBSD 4.5</name>
+    <version>4.5</version>
+    <family>BSD</family>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.4'/>
+    <derives-from id='http://openbsd.org/openbsd/4.4'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.5 Install CD</volume-id>
+	<application-id>OpenBSD 4.5 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.8";>
+    <short-id>openbsd48</short-id>
+    <name>OpenBSD 4.8</name>
+    <version>4.8</version>
+    <family>BSD</family>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.5'/>
+    <derives-from id='http://openbsd.org/openbsd/4.5'/>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.8 Install CD</volume-id>
+	<application-id>OpenBSD 4.8 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+  <os id="http://openbsd.org/openbsd/4.9";>
+    <short-id>openbsd49</short-id>
+    <name>OpenBSD 4.9</name>
+    <version>4.9</version>
+    <family>BSD</family>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.8'/>
+    <derives-from id='http://openbsd.org/openbsd/4.8'/>
+
+    <devices>
+      <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1022/2000"/>
+    </devices>
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   4.9 Install CD</volume-id>
+	<application-id>OpenBSD 4.9 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+
+  <os id="http://openbsd.org/openbsd/5.0";>
+    <short-id>openbsd50</short-id>
+    <name>OpenBSD 5.0</name>
+    <version>5.0</version>
+    <family>BSD</family>
+    <vendor>OpenBSD Project</vendor>
+    <upgrades id='http://openbsd.org/openbsd/4.9'/>
+    <derives-from id='http://openbsd.org/openbsd/4.9'/>
+
+
+    <media arch='i386'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/i386    5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 i386 Install CD</application-id>
+      </iso>
+    </media>
+
+    <media arch='x86_64'>
+      <iso>
+	<publisher-id>The OpenBSD project</publisher-id>
+	<system-id>OpenBSD</system-id>
+	<volume-id>OpenBSD/amd64   5.0 Install CD</volume-id>
+	<application-id>OpenBSD 5.0 amd64 Install CD</application-id>
+      </iso>
+    </media>
+  </os>
+
+</libosinfo>
diff --git a/test/isodata/openbsd/openbsd42/openbsd-4.2-amd64.txt b/test/isodata/openbsd/openbsd42/openbsd-4.2-amd64.txt
new file mode 100644
index 0000000..f05ab3f
--- /dev/null
+++ b/test/isodata/openbsd/openbsd42/openbsd-4.2-amd64.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/amd64   4.2 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2007 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.2 amd64 Install CD
+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: 114111
+El Torito VD version 1 found, boot catalog is in sector 22927
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2007 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 7DC8 32200
diff --git a/test/isodata/openbsd/openbsd42/openbsd-4.2-i386.txt b/test/isodata/openbsd/openbsd42/openbsd-4.2-i386.txt
new file mode 100644
index 0000000..9aa84d5
--- /dev/null
+++ b/test/isodata/openbsd/openbsd42/openbsd-4.2-i386.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/i386    4.2 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2007 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.2 i386 Install CD
+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: 104274
+El Torito VD version 1 found, boot catalog is in sector 20834
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2007 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 7300 29440
diff --git a/test/isodata/openbsd/openbsd43/openbsd-4.3-amd64.txt b/test/isodata/openbsd/openbsd43/openbsd-4.3-amd64.txt
new file mode 100644
index 0000000..c050f3e
--- /dev/null
+++ b/test/isodata/openbsd/openbsd43/openbsd-4.3-amd64.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/amd64   4.3 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2008 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.3 amd64 Install CD
+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: 113499
+El Torito VD version 1 found, boot catalog is in sector 23639
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2008 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 81EE 33262
diff --git a/test/isodata/openbsd/openbsd43/openbsd-4.3-i386.txt b/test/isodata/openbsd/openbsd43/openbsd-4.3-i386.txt
new file mode 100644
index 0000000..a81466a
--- /dev/null
+++ b/test/isodata/openbsd/openbsd43/openbsd-4.3-i386.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/i386    4.3 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2008 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.3 i386 Install CD
+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: 103714
+El Torito VD version 1 found, boot catalog is in sector 21459
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2008 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 769C 30364
diff --git a/test/isodata/openbsd/openbsd44/openbsd-4.4-amd64.txt b/test/isodata/openbsd/openbsd44/openbsd-4.4-amd64.txt
new file mode 100644
index 0000000..d71f4cc
--- /dev/null
+++ b/test/isodata/openbsd/openbsd44/openbsd-4.4-amd64.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/amd64   4.4 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2008 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.4 amd64 Install CD
+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: 120971
+El Torito VD version 1 found, boot catalog is in sector 23657
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2008 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 848E 33934
diff --git a/test/isodata/openbsd/openbsd44/openbsd-4.4-i386.txt b/test/isodata/openbsd/openbsd44/openbsd-4.4-i386.txt
new file mode 100644
index 0000000..a25bfe2
--- /dev/null
+++ b/test/isodata/openbsd/openbsd44/openbsd-4.4-i386.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/i386    4.4 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2008 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.4 i386 Install CD
+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: 110488
+El Torito VD version 1 found, boot catalog is in sector 21484
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2008 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 78D9 30937
diff --git a/test/isodata/openbsd/openbsd45/openbsd-4.5-amd64.txt b/test/isodata/openbsd/openbsd45/openbsd-4.5-amd64.txt
new file mode 100644
index 0000000..69a32ca
--- /dev/null
+++ b/test/isodata/openbsd/openbsd45/openbsd-4.5-amd64.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/amd64   4.5 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2009 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.5 amd64 Install CD
+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: 128267
+El Torito VD version 1 found, boot catalog is in sector 25702
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2009 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 8CCA 36042
diff --git a/test/isodata/openbsd/openbsd45/openbsd-4.5-i386.txt b/test/isodata/openbsd/openbsd45/openbsd-4.5-i386.txt
new file mode 100644
index 0000000..6628d61
--- /dev/null
+++ b/test/isodata/openbsd/openbsd45/openbsd-4.5-i386.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/i386    4.5 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2009 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.5 i386 Install CD
+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: 117163
+El Torito VD version 1 found, boot catalog is in sector 23502
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2009 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 8026 32806
diff --git a/test/isodata/openbsd/openbsd48/openbsd-4.8-amd64.txt b/test/isodata/openbsd/openbsd48/openbsd-4.8-amd64.txt
new file mode 100644
index 0000000..043003b
--- /dev/null
+++ b/test/isodata/openbsd/openbsd48/openbsd-4.8-amd64.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/amd64   4.8 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2010 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.8 amd64 Install CD
+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: 115261
+El Torito VD version 1 found, boot catalog is in sector 27999
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2010 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 9CBB 40123
diff --git a/test/isodata/openbsd/openbsd48/openbsd-4.8-i386.txt b/test/isodata/openbsd/openbsd48/openbsd-4.8-i386.txt
new file mode 100644
index 0000000..62f790c
--- /dev/null
+++ b/test/isodata/openbsd/openbsd48/openbsd-4.8-i386.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/i386    4.8 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2010 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.8 i386 Install CD
+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: 108377
+El Torito VD version 1 found, boot catalog is in sector 25835
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2010 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 92E9 37609
diff --git a/test/isodata/openbsd/openbsd49/openbsd-4.9-amd64.txt b/test/isodata/openbsd/openbsd49/openbsd-4.9-amd64.txt
new file mode 100644
index 0000000..5496d3e
--- /dev/null
+++ b/test/isodata/openbsd/openbsd49/openbsd-4.9-amd64.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/amd64   4.9 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2011 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.9 amd64 Install CD
+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: 117210
+El Torito VD version 1 found, boot catalog is in sector 28968
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2011 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff A122 41250
diff --git a/test/isodata/openbsd/openbsd49/openbsd-4.9-i386.txt b/test/isodata/openbsd/openbsd49/openbsd-4.9-i386.txt
new file mode 100644
index 0000000..ec8b7e1
--- /dev/null
+++ b/test/isodata/openbsd/openbsd49/openbsd-4.9-i386.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/i386    4.9 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2011 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 4.9 i386 Install CD
+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: 110196
+El Torito VD version 1 found, boot catalog is in sector 26784
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2011 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 9758 38744
diff --git a/test/isodata/openbsd/openbsd50/openbsd-5.0-amd64.txt b/test/isodata/openbsd/openbsd50/openbsd-5.0-amd64.txt
new file mode 100644
index 0000000..fdc5163
--- /dev/null
+++ b/test/isodata/openbsd/openbsd50/openbsd-5.0-amd64.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/amd64   5.0 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2011 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 5.0 amd64 Install CD
+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: 119287
+El Torito VD version 1 found, boot catalog is in sector 29189
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2011 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff A268 41576
diff --git a/test/isodata/openbsd/openbsd50/openbsd-5.0-i386.txt b/test/isodata/openbsd/openbsd50/openbsd-5.0-i386.txt
new file mode 100644
index 0000000..cf5eae0
--- /dev/null
+++ b/test/isodata/openbsd/openbsd50/openbsd-5.0-i386.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: OpenBSD
+Volume id: OpenBSD/i386    5.0 Install CD
+Volume set id: 
+Publisher id: Copyright (c) 2011 Theo de Raadt, The OpenBSD project
+Data preparer id: Theo de Raadt <deraadt openbsd org>
+Application id: OpenBSD 5.0 i386 Install CD
+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: 112025
+El Torito VD version 1 found, boot catalog is in sector 26985
+NO Joliet present
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Copyright (c) 2011 Theo'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 97F0 38896
diff --git a/test/test-isodetect.c b/test/test-isodetect.c
index 5c873ea..c69ec0b 100644
--- a/test/test-isodetect.c
+++ b/test/test-isodetect.c
@@ -259,7 +259,7 @@ static void test_one(const gchar *vendor)
         const gchar *shortid = osinfo_product_get_short_id(OSINFO_PRODUCT(os));
         fail_unless(g_str_equal(shortid, info->shortid),
                     "ISO %s matched OS %s instead of expected %s",
-                    info->filename, info->shortid, shortid);
+                    info->filename, shortid, info->shortid);
 
         tmp = tmp->next;
     }
@@ -295,6 +295,12 @@ START_TEST(test_windows)
 }
 END_TEST
 
+START_TEST(test_openbsd)
+{
+    test_one("openbsd");
+}
+END_TEST
+
 
 
 static Suite *
@@ -308,6 +314,7 @@ list_suite(void)
     tcase_add_test(tc, test_ubuntu);
     tcase_add_test(tc, test_debian);
     tcase_add_test(tc, test_windows);
+    tcase_add_test(tc, test_openbsd);
     suite_add_tcase(s, tc);
     return s;
 }
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]