[Libosinfo] [libosinfo 4/4] Fix ubuntu 11.10 detection

Christophe Fergeau cfergeau at redhat.com
Mon Jun 3 16:36:31 UTC 2013


The ISO system ID is not set to LINUX on these ISOs but is empty
---
 data/oses/ubuntu.xml.in                            |  4 ---
 .../ubuntu11.10/ubuntu-11.10-desktop-amd64.iso.txt | 29 ++++++++++++++++++++++
 .../ubuntu11.10/ubuntu-11.10-desktop-i386.iso.txt  | 29 ++++++++++++++++++++++
 .../ubuntu11.10/ubuntu-11.10-server-amd64.iso.txt  | 29 ++++++++++++++++++++++
 .../ubuntu11.10/ubuntu-11.10-server-i386.iso.txt   | 29 ++++++++++++++++++++++
 5 files changed, 116 insertions(+), 4 deletions(-)
 create mode 100644 test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-amd64.iso.txt
 create mode 100644 test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-i386.iso.txt
 create mode 100644 test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-amd64.iso.txt
 create mode 100644 test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-i386.iso.txt

diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in
index e23c61d..2324e2d 100644
--- a/data/oses/ubuntu.xml.in
+++ b/data/oses/ubuntu.xml.in
@@ -1026,7 +1026,6 @@
       <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 11.10 i386</volume-id>
-        <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
@@ -1035,7 +1034,6 @@
       <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 11.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
@@ -1045,7 +1043,6 @@
       <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso</url>
       <iso>
         <volume-id>Ubuntu 11.10 i386</volume-id>
-        <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
@@ -1054,7 +1051,6 @@
       <url>http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 11.10 amd64</volume-id>
-        <system-id>LINUX</system-id>
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd.img</initrd>
diff --git a/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-amd64.iso.txt b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-amd64.iso.txt
new file mode 100644
index 0000000..a956ee9
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu 11.10 amd64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 357014
+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 5687A 354426
diff --git a/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-i386.iso.txt b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-i386.iso.txt
new file mode 100644
index 0000000..fdad323
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-desktop-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu 11.10 i386
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 355990
+El Torito VD version 1 found, boot catalog is in sector 274
+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 561D1 352721
diff --git a/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-amd64.iso.txt b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-amd64.iso.txt
new file mode 100644
index 0000000..a445d99
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 11.10 amd64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 349334
+El Torito VD version 1 found, boot catalog is in sector 3706
+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 449A 17562
diff --git a/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-i386.iso.txt b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-i386.iso.txt
new file mode 100644
index 0000000..849bc06
--- /dev/null
+++ b/test/isodata/ubuntu/ubuntu11.10/ubuntu-11.10-server-i386.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 11.10 i386
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.0.8 2011.04.14.073001, LIBISOBURN-1.0.8, LIBISOFS-1.0.8, LIBBURN-1.0.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: 347798
+El Torito VD version 1 found, boot catalog is in sector 3670
+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 31E2C 204332
-- 
1.8.2.1




More information about the Libosinfo mailing list