From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
All windows distros have a short name prefix of 'win'
except for 'vista'. Fix that to be 'winvista'
---
data/oses/windows.xml | 8 ++--
...ndows_vista_business_sp2_x64_dvd_342327.iso.txt | 29 ------------------
...ndows_vista_business_sp2_x86_dvd_342321.iso.txt | 31 --------------------
...s_with_service_pack_1_x64_dvd_x14-56048.iso.txt | 31 --------------------
...s_with_service_pack_1_x86_dvd_x14-56028.iso.txt | 31 --------------------
...e_with_service_pack_1_x64_dvd_x14-55934.iso.txt | 31 --------------------
...e_with_service_pack_1_x86_dvd_x14-55954.iso.txt | 31 --------------------
...ise_with_service_pack_2_beta_x86_288250.iso.txt | 29 ------------------
...sta_enterprise_with_sp2_beta_x64_288254.iso.txt | 29 ------------------
.../en_windows_vista_x64_dvd_X12-40712.iso.txt | 31 --------------------
.../en_windows_vista_x64_dvd_x12-40712.iso.txt | 29 ------------------
.../en_windows_vista_x86_dvd_X12-34293.iso.txt | 31 --------------------
.../en_windows_vista_x86_dvd_x12-34293.iso.txt | 29 ------------------
...ndows_vista_business_sp2_x64_dvd_342327.iso.txt | 29 ++++++++++++++++++
...ndows_vista_business_sp2_x86_dvd_342321.iso.txt | 31 ++++++++++++++++++++
...s_with_service_pack_1_x64_dvd_x14-56048.iso.txt | 31 ++++++++++++++++++++
...s_with_service_pack_1_x86_dvd_x14-56028.iso.txt | 31 ++++++++++++++++++++
...e_with_service_pack_1_x64_dvd_x14-55934.iso.txt | 31 ++++++++++++++++++++
...e_with_service_pack_1_x86_dvd_x14-55954.iso.txt | 31 ++++++++++++++++++++
...ise_with_service_pack_2_beta_x86_288250.iso.txt | 29 ++++++++++++++++++
...sta_enterprise_with_sp2_beta_x64_288254.iso.txt | 29 ++++++++++++++++++
.../en_windows_vista_x64_dvd_X12-40712.iso.txt | 31 ++++++++++++++++++++
.../en_windows_vista_x64_dvd_x12-40712.iso.txt | 29 ++++++++++++++++++
.../en_windows_vista_x86_dvd_X12-34293.iso.txt | 31 ++++++++++++++++++++
.../en_windows_vista_x86_dvd_x12-34293.iso.txt | 29 ++++++++++++++++++
25 files changed, 366 insertions(+), 366 deletions(-)
delete mode 100644 test/isodata/windows/vista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_x64_dvd_X12-40712.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_x64_dvd_x12-40712.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_x86_dvd_X12-34293.iso.txt
delete mode 100644 test/isodata/windows/vista/en_windows_vista_x86_dvd_x12-34293.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
create mode 100644 test/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
index 8cb3c5c..4d88bfd 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml
@@ -468,8 +468,8 @@
</resources>
</os>
- <os id="http://microsoft.com/vista";>
- <short-id>vista</short-id>
+ <os id="http://microsoft.com/winvista";>
+ <short-id>winvista</short-id>
<name>Microsoft Windows Vista</name>
<version>6.0</version>
<vendor>Microsoft Corporation</vendor>
@@ -517,8 +517,8 @@
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
<distro>windows</distro>
- <derives-from id="http://microsoft.com/vista"/>
- <upgrades id="http://microsoft.com/vista"/>
+ <derives-from id="http://microsoft.com/winvista"/>
+ <upgrades id="http://microsoft.com/winvista"/>
<release-date>2009-10-22</release-date>
<eol-date>2015-01-13</eol-date>
diff --git a/test/isodata/windows/vista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt b/test/isodata/windows/vista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
deleted file mode 100644
index 9a0fedd..0000000
--- a/test/isodata/windows/vista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FRTMBXVOL_EN_DVD
-Volume set id: FRTMBXVOL_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: 1564919
-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 4
- Bootoff 265 613
diff --git a/test/isodata/windows/vista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt b/test/isodata/windows/vista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
deleted file mode 100644
index 5866d68..0000000
--- a/test/isodata/windows/vista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FRTMBVOL_EN_DVD
-Volume set id: FRTMBVOL_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: 1183921
-El Torito VD version 1 found, boot catalog is in sector 22
-NO Joliet present
-
-No SUSP/Rock Ridge present
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID 'Microsoft Corporation'
- Cksum 4C 49 OK
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 0 (No Emulation Boot)
- Load segment 0
- Sys type 0
- Nsect 4
- Bootoff 267 615
diff --git a/test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt b/test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
deleted file mode 100644
index a53661c..0000000
--- a/test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FRMBXVOL_EN_DVD
-Volume set id: FRMBXVOL_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: 1478120
-El Torito VD version 1 found, boot catalog is in sector 22
-NO Joliet present
-
-No SUSP/Rock Ridge present
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID 'Microsoft Corporation'
- Cksum 4C 49 OK
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 0 (No Emulation Boot)
- Load segment 0
- Sys type 0
- Nsect 4
- Bootoff 261 609
diff --git a/test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt b/test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
deleted file mode 100644
index cd3537f..0000000
--- a/test/isodata/windows/vista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FRMBVOL_EN_DVD
-Volume set id: FRMBVOL_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: 1125880
-El Torito VD version 1 found, boot catalog is in sector 22
-NO Joliet present
-
-No SUSP/Rock Ridge present
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID 'Microsoft Corporation'
- Cksum 4C 49 OK
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 0 (No Emulation Boot)
- Load segment 0
- Sys type 0
- Nsect 4
- Bootoff 263 611
diff --git a/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt b/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
deleted file mode 100644
index 4d59c99..0000000
--- a/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FRMEXVOL_EN_DVD
-Volume set id: FRMEXVOL_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: 1478492
-El Torito VD version 1 found, boot catalog is in sector 22
-NO Joliet present
-
-No SUSP/Rock Ridge present
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID 'Microsoft Corporation'
- Cksum 4C 49 OK
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 0 (No Emulation Boot)
- Load segment 0
- Sys type 0
- Nsect 4
- Bootoff 261 609
diff --git a/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt b/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
deleted file mode 100644
index 95a768a..0000000
--- a/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FRMEVOL_EN_DVD
-Volume set id: FRMEVOL_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: 1125438
-El Torito VD version 1 found, boot catalog is in sector 22
-NO Joliet present
-
-No SUSP/Rock Ridge present
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID 'Microsoft Corporation'
- Cksum 4C 49 OK
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 0 (No Emulation Boot)
- Load segment 0
- Sys type 0
- Nsect 4
- Bootoff 263 611
diff --git a/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt b/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
deleted file mode 100644
index bf84241..0000000
--- a/test/isodata/windows/vista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FB1EVOL_EN_DVD
-Volume set id: FB1EVOL_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: 1185707
-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 4
- Bootoff 25F 607
diff --git a/test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt b/test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
deleted file mode 100644
index e2d8ddd..0000000
--- a/test/isodata/windows/vista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: FB1EXVOL_EN_DVD
-Volume set id: FB1EXVOL_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: 1572259
-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 4
- Bootoff 25D 605
diff --git a/test/isodata/windows/vista/en_windows_vista_x64_dvd_X12-40712.iso.txt b/test/isodata/windows/vista/en_windows_vista_x64_dvd_X12-40712.iso.txt
deleted file mode 100644
index 12fa9ed..0000000
--- a/test/isodata/windows/vista/en_windows_vista_x64_dvd_X12-40712.iso.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: LRMCXFRE_EN_DVD
-Volume set id: LRMCXFRE_EN_DVD
-Publisher id: MICROSOFT CORPORATION
-Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
-Application id: CDIMAGE 2.52 (03/09/2004 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: 1853755
-El Torito VD version 1 found, boot catalog is in sector 22
-NO Joliet present
-
-No SUSP/Rock Ridge present
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID 'Microsoft Corporation'
- Cksum 4C 49 OK
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 0 (No Emulation Boot)
- Load segment 0
- Sys type 0
- Nsect 4
- Bootoff 225 549
diff --git a/test/isodata/windows/vista/en_windows_vista_x64_dvd_x12-40712.iso.txt b/test/isodata/windows/vista/en_windows_vista_x64_dvd_x12-40712.iso.txt
deleted file mode 100644
index 1f0b4be..0000000
--- a/test/isodata/windows/vista/en_windows_vista_x64_dvd_x12-40712.iso.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: LRMCXFRE_EN_DVD
-Volume set id: LRMCXFRE_EN_DVD
-Publisher id: MICROSOFT CORPORATION
-Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
-Application id: CDIMAGE 2.52 (03/09/2004 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: 1853755
-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 4
- Bootoff 225 549
diff --git a/test/isodata/windows/vista/en_windows_vista_x86_dvd_X12-34293.iso.txt b/test/isodata/windows/vista/en_windows_vista_x86_dvd_X12-34293.iso.txt
deleted file mode 100644
index d147e4d..0000000
--- a/test/isodata/windows/vista/en_windows_vista_x86_dvd_X12-34293.iso.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: LRMCFRE_EN_DVD
-Volume set id: LRMCFRE_EN_DVD
-Publisher id: MICROSOFT CORPORATION
-Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
-Application id: CDIMAGE 2.52 (03/09/2004 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: 1307917
-El Torito VD version 1 found, boot catalog is in sector 22
-NO Joliet present
-
-No SUSP/Rock Ridge present
-Eltorito validation header:
- Hid 1
- Arch 0 (x86)
- ID 'Microsoft Corporation'
- Cksum 4C 49 OK
- Key 55 AA
- Eltorito defaultboot header:
- Bootid 88 (bootable)
- Boot media 0 (No Emulation Boot)
- Load segment 0
- Sys type 0
- Nsect 4
- Bootoff 227 551
diff --git a/test/isodata/windows/vista/en_windows_vista_x86_dvd_x12-34293.iso.txt b/test/isodata/windows/vista/en_windows_vista_x86_dvd_x12-34293.iso.txt
deleted file mode 100644
index a226e74..0000000
--- a/test/isodata/windows/vista/en_windows_vista_x86_dvd_x12-34293.iso.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CD-ROM is in ISO 9660 format
-System id:
-Volume id: LRMCFRE_EN_DVD
-Volume set id: LRMCFRE_EN_DVD
-Publisher id: MICROSOFT CORPORATION
-Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
-Application id: CDIMAGE 2.52 (03/09/2004 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: 1307917
-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 4
- Bootoff 227 551
diff --git a/test/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt b/test/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
new file mode 100644
index 0000000..9a0fedd
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_business_sp2_x64_dvd_342327.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRTMBXVOL_EN_DVD
+Volume set id: FRTMBXVOL_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: 1564919
+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 4
+ Bootoff 265 613
diff --git a/test/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt b/test/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
new file mode 100644
index 0000000..5866d68
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_business_sp2_x86_dvd_342321.iso.txt
@@ -0,0 +1,31 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRTMBVOL_EN_DVD
+Volume set id: FRTMBVOL_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: 1183921
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+
+No SUSP/Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Cksum 4C 49 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 267 615
diff --git a/test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt b/test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
new file mode 100644
index 0000000..a53661c
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x64_dvd_x14-56048.iso.txt
@@ -0,0 +1,31 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRMBXVOL_EN_DVD
+Volume set id: FRMBXVOL_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: 1478120
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+
+No SUSP/Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Cksum 4C 49 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 261 609
diff --git a/test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt b/test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
new file mode 100644
index 0000000..cd3537f
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_business_with_service_pack_1_x86_dvd_x14-56028.iso.txt
@@ -0,0 +1,31 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRMBVOL_EN_DVD
+Volume set id: FRMBVOL_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: 1125880
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+
+No SUSP/Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Cksum 4C 49 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 263 611
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
new file mode 100644
index 0000000..4d59c99
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x64_dvd_x14-55934.iso.txt
@@ -0,0 +1,31 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRMEXVOL_EN_DVD
+Volume set id: FRMEXVOL_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: 1478492
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+
+No SUSP/Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Cksum 4C 49 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 261 609
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
new file mode 100644
index 0000000..95a768a
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_1_x86_dvd_x14-55954.iso.txt
@@ -0,0 +1,31 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FRMEVOL_EN_DVD
+Volume set id: FRMEVOL_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: 1125438
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+
+No SUSP/Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Cksum 4C 49 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 263 611
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
new file mode 100644
index 0000000..bf84241
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_service_pack_2_beta_x86_288250.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FB1EVOL_EN_DVD
+Volume set id: FB1EVOL_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: 1185707
+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 4
+ Bootoff 25F 607
diff --git a/test/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
new file mode 100644
index 0000000..e2d8ddd
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_enterprise_with_sp2_beta_x64_288254.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: FB1EXVOL_EN_DVD
+Volume set id: FB1EXVOL_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: 1572259
+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 4
+ Bootoff 25D 605
diff --git a/test/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt b/test/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
new file mode 100644
index 0000000..12fa9ed
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_x64_dvd_X12-40712.iso.txt
@@ -0,0 +1,31 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: LRMCXFRE_EN_DVD
+Volume set id: LRMCXFRE_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 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: 1853755
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+
+No SUSP/Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Cksum 4C 49 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 225 549
diff --git a/test/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt b/test/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
new file mode 100644
index 0000000..1f0b4be
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_x64_dvd_x12-40712.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: LRMCXFRE_EN_DVD
+Volume set id: LRMCXFRE_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 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: 1853755
+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 4
+ Bootoff 225 549
diff --git a/test/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt b/test/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
new file mode 100644
index 0000000..d147e4d
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_x86_dvd_X12-34293.iso.txt
@@ -0,0 +1,31 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: LRMCFRE_EN_DVD
+Volume set id: LRMCFRE_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 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: 1307917
+El Torito VD version 1 found, boot catalog is in sector 22
+NO Joliet present
+
+No SUSP/Rock Ridge present
+Eltorito validation header:
+ Hid 1
+ Arch 0 (x86)
+ ID 'Microsoft Corporation'
+ Cksum 4C 49 OK
+ Key 55 AA
+ Eltorito defaultboot header:
+ Bootid 88 (bootable)
+ Boot media 0 (No Emulation Boot)
+ Load segment 0
+ Sys type 0
+ Nsect 4
+ Bootoff 227 551
diff --git a/test/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt b/test/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
new file mode 100644
index 0000000..a226e74
--- /dev/null
+++ b/test/isodata/windows/winvista/en_windows_vista_x86_dvd_x12-34293.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id:
+Volume id: LRMCFRE_EN_DVD
+Volume set id: LRMCFRE_EN_DVD
+Publisher id: MICROSOFT CORPORATION
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
+Application id: CDIMAGE 2.52 (03/09/2004 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: 1307917
+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 4
+ Bootoff 227 551
--
1.7.7.6
