From: Fabiano Fidêncio <fabiano@xxxxxxxxxxxx> Signed-off-by: Fabiano Fidêncio <fabiano@xxxxxxxxxxxx> Acked-by: Zeeshan Ali (Khattak) <zeeshanak@xxxxxxxxx> --- data/os/microsoft.com/win-8.1.xml.in | 4 +-- ....1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt | 29 ++++++++++++++++++++++ ....1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt | 29 ++++++++++++++++++++++ ..._8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt | 29 ++++++++++++++++++++++ ..._8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt | 29 ++++++++++++++++++++++ 5 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt create mode 100644 test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt diff --git a/data/os/microsoft.com/win-8.1.xml.in b/data/os/microsoft.com/win-8.1.xml.in index 92043bb..0c01b25 100644 --- a/data/os/microsoft.com/win-8.1.xml.in +++ b/data/os/microsoft.com/win-8.1.xml.in @@ -67,7 +67,7 @@ <media arch="i686"> <variant id="professional"/> <iso> - <volume-id>(IR1_CPRN?A_X86FREV)_</volume-id> + <volume-id>(IR[15]_CPRN?A_X86FREV)_</volume-id> <publisher-id>MICROSOFT CORPORATION</publisher-id> <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language> </iso> @@ -75,7 +75,7 @@ <media arch="x86_64"> <variant id="professional"/> <iso> - <volume-id>(IR1_CPRN?A_X64FREV)_</volume-id> + <volume-id>(IR[15]_CPRN?A_X64FREV|)_</volume-id> <publisher-id>MICROSOFT CORPORATION</publisher-id> <l10n-language regex="true" l10n-language-map="http://microsoft.com/win/8/l10n-language">[[:upper:][:digit:]_]*_([[:upper:]]*-[[:upper:]]*)</l10n-language> </iso> diff --git a/test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt new file mode 100644 index 0000000..62b06df --- /dev/null +++ b/test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x64_dvd_6050969.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: IR5_CPRNA_X64FREV_EN-US_DV9 +Volume set id: IR5_CPRNA_X64FREV_EN-US_DV9 +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.53 (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: 1929794 +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 86A 2154 diff --git a/test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt new file mode 100644 index 0000000..698af0f --- /dev/null +++ b/test/isodata/windows/win8.1/en_windows_8.1_pro_n_vl_with_update_x86_dvd_6051127.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: IR5_CPRNA_X86FREV_EN-US_DV9 +Volume set id: IR5_CPRNA_X86FREV_EN-US_DV9 +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.53 (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: 1425503 +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 5B4 1460 diff --git a/test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt new file mode 100644 index 0000000..b343e92 --- /dev/null +++ b/test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x64_dvd_6050880.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: IR5_CPRA_X64FREV_EN-US_DV9 +Volume set id: IR5_CPRA_X64FREV_EN-US_DV9 +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.53 (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: 2021654 +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 86A 2154 diff --git a/test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt b/test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt new file mode 100644 index 0000000..17547d6 --- /dev/null +++ b/test/isodata/windows/win8.1/en_windows_8.1_pro_vl_with_update_x86_dvd_6050918.iso.txt @@ -0,0 +1,29 @@ +CD-ROM is in ISO 9660 format +System id: +Volume id: IR5_CPRA_X86FREV_EN-US_DV9 +Volume set id: IR5_CPRA_X86FREV_EN-US_DV9 +Publisher id: MICROSOFT CORPORATION +Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080 +Application id: CDIMAGE 2.53 (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: 1493235 +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 5B4 1460 -- 2.7.3 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo