From cfergeau at redhat.com Mon Jun 3 16:36:29 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 3 Jun 2013 18:36:29 +0200 Subject: [Libosinfo] [libosinfo 2/4] Add test case for win2k8r2 ISO In-Reply-To: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> References: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> Message-ID: <1370277391-16025-2-git-send-email-cfergeau@redhat.com> --- ...indows_server_2008_r2_x64_dvd_x15-50365.iso.txt | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 test/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt diff --git a/test/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt b/test/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt new file mode 100644 index 0000000..11f9192 --- /dev/null +++ b/test/isodata/windows/win2k8r2/en_windows_server_2008_r2_x64_dvd_x15-50365.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: GRMSXFRER_EN_DVD +Volume set id: GRMSXFRER_EN_DVD +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.54 (01/01/2005 TM) +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: 1463273 +El Torito VD version 1 found, boot catalog is in sector 22 +NO Joliet present +NO Rock Ridge present +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Microsoft Corporation' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 8 + Bootoff 3E4 996 -- 1.8.2.1 From cfergeau at redhat.com Mon Jun 3 16:36:31 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 3 Jun 2013 18:36:31 +0200 Subject: [Libosinfo] [libosinfo 4/4] Fix ubuntu 11.10 detection In-Reply-To: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> References: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> Message-ID: <1370277391-16025-4-git-send-email-cfergeau@redhat.com> 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 @@ http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso Ubuntu-Server 11.10 i386 - LINUX casper/vmlinuz casper/initrd.img @@ -1035,7 +1034,6 @@ http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso Ubuntu-Server 11.10 amd64 - LINUX casper/vmlinuz casper/initrd.img @@ -1045,7 +1043,6 @@ http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso Ubuntu 11.10 i386 - LINUX casper/vmlinuz casper/initrd.img @@ -1054,7 +1051,6 @@ http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso Ubuntu 11.10 amd64 - LINUX casper/vmlinuz casper/initrd.img 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 From cfergeau at redhat.com Mon Jun 3 16:36:28 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 3 Jun 2013 18:36:28 +0200 Subject: [Libosinfo] [libosinfo 1/4] Add volume id for Windows 7 Enterprise N SP1 Message-ID: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> --- data/oses/windows.xml.in | 2 +- ..._enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in index 26d4410..eae9873 100644 --- a/data/oses/windows.xml.in +++ b/data/oses/windows.xml.in @@ -738,7 +738,7 @@ - (GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL)_ + (GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL|GSP1RMCNENVOL)_ MICROSOFT CORPORATION [[:upper:][:digit:]]*_([[:upper:]]*) diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt new file mode 100644 index 0000000..6671578 --- /dev/null +++ b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x86_dvd_u_677703.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: GSP1RMCNENVOL_EN_DVD +Volume set id: GSP1RMCNENVOL_EN_DVD +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.54 (01/01/2005 TM) +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: 1049368 +El Torito VD version 1 found, boot catalog is in sector 22 +NO Joliet present +NO Rock Ridge present +Eltorito validation header: + Hid 1 + Arch 0 (x86) + ID 'Microsoft Corporation' + Key 55 AA + Eltorito defaultboot header: + Bootid 88 (bootable) + Boot media 0 (No Emulation Boot) + Load segment 0 + Sys type 0 + Nsect 8 + Bootoff 2DF 735 -- 1.8.2.1 From cfergeau at redhat.com Mon Jun 3 16:36:30 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Mon, 3 Jun 2013 18:36:30 +0200 Subject: [Libosinfo] [libosinfo 3/4] Adjust ubuntu URLs In-Reply-To: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> References: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> Message-ID: <1370277391-16025-3-git-send-email-cfergeau@redhat.com> Some older releases have been moved from http://releases.ubuntu.com to http://old-releases.ubuntu.com --- data/oses/ubuntu.xml.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/oses/ubuntu.xml.in b/data/oses/ubuntu.xml.in index 8d3b9cf..e23c61d 100644 --- a/data/oses/ubuntu.xml.in +++ b/data/oses/ubuntu.xml.in @@ -889,7 +889,7 @@ - http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso + http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso Ubuntu-Server 10.10 i386 LINUX @@ -898,7 +898,7 @@ casper/initrd.img - http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso + http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso Ubuntu-Server 10.10 amd64 LINUX @@ -908,7 +908,7 @@ - http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso + http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso Ubuntu 10.10 i386 LINUX @@ -917,7 +917,7 @@ casper/initrd.img - http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso + http://old-releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso Ubuntu 10.10 amd64 LINUX @@ -956,7 +956,7 @@ - http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso + http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-i386.iso Ubuntu-Server 11.04 i386 LINUX @@ -965,7 +965,7 @@ casper/initrd.img - http://releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso + http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-server-amd64.iso Ubuntu-Server 11.04 amd64 LINUX @@ -975,7 +975,7 @@ - http://releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-i386.iso + http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-i386.iso Ubuntu 11.04 i386 LINUX @@ -984,7 +984,7 @@ casper/initrd.img - http://releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso + http://old-releases.ubuntu.com/releases/natty/ubuntu-11.04-desktop-amd64.iso Ubuntu 11.04 amd64 LINUX @@ -1023,7 +1023,7 @@ - http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso + http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-i386.iso Ubuntu-Server 11.10 i386 LINUX @@ -1032,7 +1032,7 @@ casper/initrd.img - http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso + http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-server-amd64.iso Ubuntu-Server 11.10 amd64 LINUX @@ -1042,7 +1042,7 @@ - http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso + http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-i386.iso Ubuntu 11.10 i386 LINUX @@ -1051,7 +1051,7 @@ casper/initrd.img - http://releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso + http://old-releases.ubuntu.com/releases/oneiric/ubuntu-11.10-desktop-amd64.iso Ubuntu 11.10 amd64 LINUX -- 1.8.2.1 From fabiano at fidencio.org Mon Jun 3 17:20:19 2013 From: fabiano at fidencio.org (=?ISO-8859-1?Q?Fabiano_Fid=EAncio?=) Date: Mon, 3 Jun 2013 19:20:19 +0200 Subject: [Libosinfo] [libosinfo 1/4] Add volume id for Windows 7 Enterprise N SP1 In-Reply-To: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> References: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> Message-ID: ACK the whole series. -- Fabiano Fid?ncio From zeeshanak at gnome.org Mon Jun 3 18:39:19 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Mon, 3 Jun 2013 21:39:19 +0300 Subject: [Libosinfo] [libosinfo 1/4] Add volume id for Windows 7 Enterprise N SP1 In-Reply-To: References: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> Message-ID: On Mon, Jun 3, 2013 at 8:20 PM, Fabiano Fid?ncio wrote: > ACK the whole series. > -- ACK # 2. -- Regards, Zeeshan Ali (Khattak) FSF member#5124 From cfergeau at redhat.com Tue Jun 4 07:16:28 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Tue, 4 Jun 2013 09:16:28 +0200 Subject: [Libosinfo] [libosinfo 1/4] Add volume id for Windows 7 Enterprise N SP1 In-Reply-To: References: <1370277391-16025-1-git-send-email-cfergeau@redhat.com> Message-ID: <20130604071628.GD11272@teriyaki.redhat.com> On Mon, Jun 03, 2013 at 09:39:19PM +0300, Zeeshan Ali (Khattak) wrote: > On Mon, Jun 3, 2013 at 8:20 PM, Fabiano Fid?ncio wrote: > > ACK the whole series. > > -- > > ACK # 2. Thanks, pushed. Christophe -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 198 bytes Desc: not available URL: From cfergeau at redhat.com Wed Jun 5 12:56:39 2013 From: cfergeau at redhat.com (Christophe Fergeau) Date: Wed, 5 Jun 2013 14:56:39 +0200 Subject: [Libosinfo] [libosinfo] Add hypervisor data for newer QEMUs Message-ID: <1370436999-11770-1-git-send-email-cfergeau@redhat.com> --- data/hypervisors/qemu.xml.in | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/data/hypervisors/qemu.xml.in b/data/hypervisors/qemu.xml.in index 1a5d9c5..eb88cb4 100644 --- a/data/hypervisors/qemu.xml.in +++ b/data/hypervisors/qemu.xml.in @@ -151,4 +151,40 @@ + + qemu-1.4.0 + <_name>QEMU 1.4.0 + <_vendor>qemu.org + 1.4.0 + 2013-02-15 + + + + + qemu-1.4.1 + <_name>QEMU 1.4.1 + <_vendor>qemu.org + 1.4.1 + 2013-04-15 + + + + + qemu-1.4.2 + <_name>QEMU 1.4.2 + <_vendor>qemu.org + 1.4.2 + 2013-05-24 + + + + + qemu-1.5.0 + <_name>QEMU 1.5.0 + <_vendor>qemu.org + 1.5.0 + 2013-05-20 + + + -- 1.8.2.1 From zeeshanak at gnome.org Wed Jun 5 14:35:39 2013 From: zeeshanak at gnome.org (Zeeshan Ali (Khattak)) Date: Wed, 5 Jun 2013 17:35:39 +0300 Subject: [Libosinfo] [libosinfo] Add hypervisor data for newer QEMUs In-Reply-To: <1370436999-11770-1-git-send-email-cfergeau@redhat.com> References: <1370436999-11770-1-git-send-email-cfergeau@redhat.com> Message-ID: On Wed, Jun 5, 2013 at 3:56 PM, Christophe Fergeau wrote: > --- ACK -- Regards, Zeeshan Ali (Khattak) FSF member#5124