On Fri, Oct 12, 2012 at 06:42:44PM +0300, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" <zeeshanak@xxxxxxxxx> > > Although this is tested against only Finnish ISOs, I'm almost sure the > volume IDs I added to DB are generic and should work for ISOs of other > locales as well. You got me a bit worried here as I was wondering how to differentiate ISOs of different locales, but it's just that the locale part comes after what is matched. ACK. Christophe > --- > data/oses/windows.xml | 4 +-- > ...onal_with_sp1_vl_build_x64_dvd_u_677808.iso.txt | 29 ++++++++++++++++++++++ > ...onal_with_sp1_vl_build_x86_dvd_u_677759.iso.txt | 29 ++++++++++++++++++++++ > 3 files changed, 60 insertions(+), 2 deletions(-) > create mode 100644 test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt > create mode 100644 test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt > > diff --git a/data/oses/windows.xml b/data/oses/windows.xml > index 365a4e8..90ee4d9 100644 > --- a/data/oses/windows.xml > +++ b/data/oses/windows.xml > @@ -673,14 +673,14 @@ > > <media arch="i386" installer-reboots="2"> > <iso> > - <volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER)_</volume-id> > + <volume-id>(GRMCULFRER|GSP1RMCNPRFRER|GSP1RMCNULFRER|GSP1RMCULFRER|GSP1RMCPRFRER|GRMCENVOL|GRMCNENVOL|GRMCPRFRER|GSP1RMCPRVOL)_</volume-id> > <publisher-id>MICROSOFT CORPORATION</publisher-id> > > </iso> > </media> > <media arch="x86_64" installer-reboots="2"> > <iso> > - <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER)_</volume-id> > + <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_</volume-id> > <publisher-id>MICROSOFT CORPORATION</publisher-id> > </iso> > </media> > diff --git a/test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt b/test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt > new file mode 100644 > index 0000000..2d9faad > --- /dev/null > +++ b/test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677808.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: GSP1RMCPRXVOL_FI_DVD > +Volume set id: GSP1RMCPRXVOL_FI_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: 1489070 > +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 2DE 734 > diff --git a/test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt b/test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt > new file mode 100644 > index 0000000..3977b48 > --- /dev/null > +++ b/test/isodata/windows/win7/fi_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677759.iso.txt > @@ -0,0 +1,29 @@ > +CD-ROM is in ISO 9660 format > +System id: > +Volume id: GSP1RMCPRVOL_FI_DVD > +Volume set id: GSP1RMCPRVOL_FI_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: 1122105 > +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.7.12.1 > > _______________________________________________ > virt-tools-list mailing list > virt-tools-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/virt-tools-list
Attachment:
pgpygaUTLZjX8.pgp
Description: PGP signature
