|
 |
5ae075 |
From 179a83b02a01769836473b59f03c887e1070a4c8 Mon Sep 17 00:00:00 2001
|
|
|
5ae075 |
From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
|
|
|
5ae075 |
Date: Tue, 10 Sep 2013 04:40:51 +0300
|
|
|
5ae075 |
Subject: [PATCH] fedora,win7: Improve & add data
|
|
|
5ae075 |
|
|
|
5ae075 |
---
|
|
|
5ae075 |
data/oses/fedora.xml.in | 89 ++++++++++++++++++++--
|
|
|
5ae075 |
data/oses/windows.xml.in | 2 +-
|
|
|
5ae075 |
..._enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng | 2 +
|
|
|
5ae075 |
..._enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt | 29 +++++++
|
|
|
5ae075 |
4 files changed, 115 insertions(+), 7 deletions(-)
|
|
|
5ae075 |
create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
|
|
|
5ae075 |
create mode 100644 test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
|
|
|
5ae075 |
|
|
|
5ae075 |
diff --git a/data/oses/fedora.xml.in b/data/oses/fedora.xml.in
|
|
|
5ae075 |
index ae4256d..e5456fe 100644
|
|
|
5ae075 |
--- a/data/oses/fedora.xml.in
|
|
|
5ae075 |
+++ b/data/oses/fedora.xml.in
|
|
|
5ae075 |
@@ -1445,14 +1445,91 @@
|
|
|
5ae075 |
<resources arch="all">
|
|
|
5ae075 |
<minimum>
|
|
|
5ae075 |
<n-cpus>1</n-cpus>
|
|
|
5ae075 |
- <ram>805306368</ram>
|
|
|
5ae075 |
+ <cpu>1000000000</cpu>
|
|
|
5ae075 |
+ <ram>1073741824</ram>
|
|
|
5ae075 |
+ <storage>10737418240</storage>
|
|
|
5ae075 |
</minimum>
|
|
|
5ae075 |
+ </resources>
|
|
|
5ae075 |
|
|
|
5ae075 |
- <recommended>
|
|
|
5ae075 |
- <cpu>400000000</cpu>
|
|
|
5ae075 |
- <ram>1207959552</ram>
|
|
|
5ae075 |
- <storage>9663676416</storage>
|
|
|
5ae075 |
- </recommended>
|
|
|
5ae075 |
+ <installer>
|
|
|
5ae075 |
+ <script id='http://fedoraproject.org/scripts/fedora/jeos'/>
|
|
|
5ae075 |
+ <script id='http://fedoraproject.org/scripts/fedora/desktop'/>
|
|
|
5ae075 |
+ </installer>
|
|
|
5ae075 |
+ </os>
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <os id="http://fedoraproject.org/fedora/20">
|
|
|
5ae075 |
+ <short-id>fedora20</short-id>
|
|
|
5ae075 |
+ <_name>Fedora 20</_name>
|
|
|
5ae075 |
+ <version>20</version>
|
|
|
5ae075 |
+ <_vendor>Fedora Project</_vendor>
|
|
|
5ae075 |
+ <family>linux</family>
|
|
|
5ae075 |
+ <distro>fedora</distro>
|
|
|
5ae075 |
+ <codename>Heisenbug</codename>
|
|
|
5ae075 |
+ <upgrades id="http://fedoraproject.org/fedora/19"/>
|
|
|
5ae075 |
+ <derives-from id="http://fedoraproject.org/fedora/19"/>
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <media arch="i686">
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <iso>
|
|
|
5ae075 |
+ <volume-id>Fedora 20.* i386</volume-id>
|
|
|
5ae075 |
+ <system-id>LINUX</system-id>
|
|
|
5ae075 |
+ </iso>
|
|
|
5ae075 |
+ <kernel>isolinux/vmlinuz</kernel>
|
|
|
5ae075 |
+ <initrd>isolinux/initrd.img</initrd>
|
|
|
5ae075 |
+ </media>
|
|
|
5ae075 |
+ <media arch="x86_64">
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <iso>
|
|
|
5ae075 |
+ <volume-id>Fedora 20.* x86_64</volume-id>
|
|
|
5ae075 |
+ <system-id>LINUX</system-id>
|
|
|
5ae075 |
+ </iso>
|
|
|
5ae075 |
+ <kernel>isolinux/vmlinuz</kernel>
|
|
|
5ae075 |
+ <initrd>isolinux/initrd.img</initrd>
|
|
|
5ae075 |
+ </media>
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <media arch="i686" live="true">
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <iso>
|
|
|
5ae075 |
+ <volume-id>Fedora-Live-.*-i686-20</volume-id>
|
|
|
5ae075 |
+ <system-id>LINUX</system-id>
|
|
|
5ae075 |
+ </iso>
|
|
|
5ae075 |
+ <kernel>isolinux/vmlinuz0</kernel>
|
|
|
5ae075 |
+ <initrd>isolinux/initrd0.img</initrd>
|
|
|
5ae075 |
+ </media>
|
|
|
5ae075 |
+ <media arch="x86_64" live="true">
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <iso>
|
|
|
5ae075 |
+ <volume-id>Fedora-Live-.*-x86_64-20</volume-id>
|
|
|
5ae075 |
+ <system-id>LINUX</system-id>
|
|
|
5ae075 |
+ </iso>
|
|
|
5ae075 |
+ <kernel>isolinux/vmlinuz0</kernel>
|
|
|
5ae075 |
+ <initrd>isolinux/initrd0.img</initrd>
|
|
|
5ae075 |
+ </media>
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <tree arch="i686">
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <treeinfo>
|
|
|
5ae075 |
+ <family>Fedora</family>
|
|
|
5ae075 |
+ <version>20</version>
|
|
|
5ae075 |
+ <arch>i386</arch>
|
|
|
5ae075 |
+ </treeinfo>
|
|
|
5ae075 |
+ </tree>
|
|
|
5ae075 |
+ <tree arch="x86_64">
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <treeinfo>
|
|
|
5ae075 |
+ <family>Fedora</family>
|
|
|
5ae075 |
+ <version>20</version>
|
|
|
5ae075 |
+ <arch>x86_64</arch>
|
|
|
5ae075 |
+ </treeinfo>
|
|
|
5ae075 |
+ </tree>
|
|
|
5ae075 |
+
|
|
|
5ae075 |
+ <resources arch="all">
|
|
|
5ae075 |
+ <minimum>
|
|
|
5ae075 |
+ <n-cpus>1</n-cpus>
|
|
|
5ae075 |
+ <cpu>1000000000</cpu>
|
|
|
5ae075 |
+ <ram>1073741824</ram>
|
|
|
5ae075 |
+ <storage>10737418240</storage>
|
|
|
5ae075 |
+ </minimum>
|
|
|
5ae075 |
</resources>
|
|
|
5ae075 |
|
|
|
5ae075 |
<installer>
|
|
|
5ae075 |
diff --git a/data/oses/windows.xml.in b/data/oses/windows.xml.in
|
|
|
5ae075 |
index 26d4410..002227b 100644
|
|
|
5ae075 |
--- a/data/oses/windows.xml.in
|
|
|
5ae075 |
+++ b/data/oses/windows.xml.in
|
|
|
5ae075 |
@@ -745,7 +745,7 @@
|
|
|
5ae075 |
</media>
|
|
|
5ae075 |
<media arch="x86_64" installer-reboots="2">
|
|
|
5ae075 |
<iso>
|
|
|
5ae075 |
- <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL)_</volume-id>
|
|
|
5ae075 |
+ <volume-id>(GRMCULXFRER|GSP1RMCPRXFRER|GSP1RMCNHPXFRER|GRMCHPXFRER|GRMCXCHK|GSP1RMCENXVOL|GRMCENXVOL|GRMCNENXVOL|GRMCPRXFRER|GSP1RMCPRXVOL|GSP1RMCNENXVOL)_</volume-id>
|
|
|
5ae075 |
<publisher-id>MICROSOFT CORPORATION</publisher-id>
|
|
|
5ae075 |
<l10n-language regex="true" l10n-language-map="http://microsoft.com/win/7/l10n-language">[[:upper:][:digit:]]*_([[:upper:]]*)</l10n-language>
|
|
|
5ae075 |
</iso>
|
|
|
5ae075 |
diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
|
|
|
5ae075 |
new file mode 100644
|
|
|
5ae075 |
index 0000000..e46008a
|
|
|
5ae075 |
--- /dev/null
|
|
|
5ae075 |
+++ b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.lng
|
|
|
5ae075 |
@@ -0,0 +1,2 @@
|
|
|
5ae075 |
+[general]
|
|
|
5ae075 |
+l10n-language=en_US
|
|
|
5ae075 |
diff --git a/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
|
|
|
5ae075 |
new file mode 100644
|
|
|
5ae075 |
index 0000000..9f8097c
|
|
|
5ae075 |
--- /dev/null
|
|
|
5ae075 |
+++ b/test/isodata/windows/win7/en_windows_7_enterprise_n_with_sp1_x64_dvd_u_677704.iso.txt
|
|
|
5ae075 |
@@ -0,0 +1,29 @@
|
|
|
5ae075 |
+CD-ROM is in ISO 9660 format
|
|
|
5ae075 |
+System id:
|
|
|
5ae075 |
+Volume id: GSP1RMCNENXVOL_EN_DVD
|
|
|
5ae075 |
+Volume set id: GSP1RMCNENXVOL_EN_DVD
|
|
|
5ae075 |
+Publisher id: MICROSOFT CORPORATION
|
|
|
5ae075 |
+Data preparer id: MICROSOFT CORPORATION, ONE MICROSOFT WAY, REDMOND WA 98052, (425) 882-8080
|
|
|
5ae075 |
+Application id: CDIMAGE 2.54 (01/01/2005 TM)
|
|
|
5ae075 |
+Copyright File id:
|
|
|
5ae075 |
+Abstract File id:
|
|
|
5ae075 |
+Bibliographic File id:
|
|
|
5ae075 |
+Volume set size is: 1
|
|
|
5ae075 |
+Volume set sequence number is: 1
|
|
|
5ae075 |
+Logical block size is: 2048
|
|
|
5ae075 |
+Volume size is: 1049368
|
|
|
5ae075 |
+El Torito VD version 1 found, boot catalog is in sector 22
|
|
|
5ae075 |
+NO Joliet present
|
|
|
5ae075 |
+NO Rock Ridge present
|
|
|
5ae075 |
+Eltorito validation header:
|
|
|
5ae075 |
+ Hid 1
|
|
|
5ae075 |
+ Arch 0 (x86)
|
|
|
5ae075 |
+ ID 'Microsoft Corporation'
|
|
|
5ae075 |
+ Key 55 AA
|
|
|
5ae075 |
+ Eltorito defaultboot header:
|
|
|
5ae075 |
+ Bootid 88 (bootable)
|
|
|
5ae075 |
+ Boot media 0 (No Emulation Boot)
|
|
|
5ae075 |
+ Load segment 0
|
|
|
5ae075 |
+ Sys type 0
|
|
|
5ae075 |
+ Nsect 8
|
|
|
5ae075 |
+ Bootoff 2DF 735
|
|
|
5ae075 |
--
|
|
|
5ae075 |
1.8.4.2
|
|
|
5ae075 |
|