Most XML files are free of hard tabs, but some aren't, and it creates
weird visual indents in git diffs.
Let's standardize on _not_ using hard tabs
Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
---
.../centos-kickstart-desktop.xml.in | 2 +-
.../centos.org/centos-kickstart-jeos.xml.in | 2 +-
.../fedora-kickstart-desktop.xml.in | 64 ++---
.../fedora-kickstart-jeos.xml.in | 60 ++--
.../silverblue-kickstart-desktop.xml.in | 2 +-
.../microsoft.com/windows-cmd-desktop.xml.in | 4 +-
.../microsoft.com/windows-reg-desktop.xml.in | 4 +-
.../microsoft.com/windows-sif-desktop.xml.in | 4 +-
.../microsoft.com/windows-sif-jeos.xml.in | 4 +-
.../windows-unattend-jeos.xml.in | 268 +++++++++---------
.../redhat.com/rhel-kickstart-desktop.xml.in | 2 +-
.../redhat.com/rhel-kickstart-jeos.xml.in | 2 +-
.../os/alpinelinux.org/alpinelinux-3.5.xml.in | 12 +-
.../os/alpinelinux.org/alpinelinux-3.6.xml.in | 12 +-
.../os/alpinelinux.org/alpinelinux-3.7.xml.in | 12 +-
data/os/debian.org/debian-9.xml.in | 12 +-
.../dragonflybsd-3.4.1.xml.in | 2 +-
data/os/fedoraproject.org/fedora-10.xml.in | 12 +-
data/os/fedoraproject.org/fedora-11.xml.in | 12 +-
data/os/fedoraproject.org/fedora-12.xml.in | 12 +-
data/os/fedoraproject.org/fedora-13.xml.in | 12 +-
data/os/fedoraproject.org/fedora-14.xml.in | 12 +-
data/os/fedoraproject.org/fedora-15.xml.in | 12 +-
data/os/fedoraproject.org/fedora-16.xml.in | 12 +-
data/os/fedoraproject.org/fedora-17.xml.in | 12 +-
data/os/fedoraproject.org/fedora-18.xml.in | 12 +-
data/os/fedoraproject.org/fedora-23.xml.in | 2 +-
data/os/fedoraproject.org/fedora-25.xml.in | 2 +-
data/os/fedoraproject.org/fedora-7.xml.in | 12 +-
data/os/fedoraproject.org/fedora-8.xml.in | 12 +-
data/os/fedoraproject.org/fedora-9.xml.in | 12 +-
data/os/freebsd.org/freebsd-12.0.xml.in | 2 +-
data/os/gentoo.org/gentoo-rolling.xml.in | 2 +-
data/os/openbsd.org/openbsd-4.2.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.3.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.4.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.5.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.8.xml.in | 16 +-
data/os/openbsd.org/openbsd-4.9.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.0.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.1.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.2.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.3.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.4.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.5.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.6.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.7.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.8.xml.in | 16 +-
data/os/openbsd.org/openbsd-5.9.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.0.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.1.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.2.xml.in | 16 +-
data/os/openbsd.org/openbsd-6.3.xml.in | 16 +-
53 files changed, 470 insertions(+), 470 deletions(-)
diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
index 8702720..a1c3373 100644
--- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
@@ -190,7 +190,7 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
" > /etc/gdm/custom.conf
%end
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
index 0caf4f6..0f1efc2 100644
--- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
@@ -135,7 +135,7 @@ url --url="http://mirror.centos.org/centos/<xsl:call-template name="version"/>/o
@core
%end
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
index 0b1d77a..7d21715 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -58,42 +58,42 @@
<xsl:value-of select="substring-after($script-disk, '/dev/')"/>
</xsl:template>
- <xsl:template name="rootfs">
- <xsl:choose>
- <xsl:when test="os/version > 10">
- <xsl:text>ext4</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>ext3</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template name="bootfs">
- <xsl:choose>
- <xsl:when test="os/version > 11">
- <xsl:text>ext4</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>ext3</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template name="keyboard">
- <xsl:choose>
- <xsl:when test="os/version > 17">
+ <xsl:template name="rootfs">
+ <xsl:choose>
+ <xsl:when test="os/version > 10">
+ <xsl:text>ext4</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>ext3</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template name="bootfs">
+ <xsl:choose>
+ <xsl:when test="os/version > 11">
+ <xsl:text>ext4</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>ext3</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template name="keyboard">
+ <xsl:choose>
+ <xsl:when test="os/version > 17">
<xsl:value-of select="config/l10n-keyboard"/>
- </xsl:when>
- <xsl:otherwise>
+ </xsl:when>
+ <xsl:otherwise>
<!-- FIXME: F17 and older required keyboard layout to be a console
layout so we'll need a different datamap for those but
currently we only support one datamap per config param per
script. -->
- <xsl:text>us</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
+ <xsl:text>us</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
<xsl:template match="/command-line">
<xsl:text>ks=</xsl:text>
@@ -233,7 +233,7 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
" > /etc/gdm/custom.conf
%end
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
index d172392..28c6628 100644
--- a/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
+++ b/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -50,42 +50,42 @@
<xsl:value-of select="substring-after($script-disk, '/dev/')"/>
</xsl:template>
- <xsl:template name="rootfs">
- <xsl:choose>
- <xsl:when test="os/version > 10">
- <xsl:text>ext4</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>ext3</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
+ <xsl:template name="rootfs">
+ <xsl:choose>
+ <xsl:when test="os/version > 10">
+ <xsl:text>ext4</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>ext3</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
- <xsl:template name="bootfs">
- <xsl:choose>
- <xsl:when test="os/version > 11">
- <xsl:text>ext4</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>ext3</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
+ <xsl:template name="bootfs">
+ <xsl:choose>
+ <xsl:when test="os/version > 11">
+ <xsl:text>ext4</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>ext3</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
- <xsl:template name="keyboard">
- <xsl:choose>
- <xsl:when test="os/version > 17">
+ <xsl:template name="keyboard">
+ <xsl:choose>
+ <xsl:when test="os/version > 17">
<xsl:value-of select="config/l10n-keyboard"/>
- </xsl:when>
- <xsl:otherwise>
+ </xsl:when>
+ <xsl:otherwise>
<!-- FIXME: F17 and older required keyboard layout to be a console
layout so we'll need a different datamap for those but
currently we only support one datamap per config param per
script. -->
- <xsl:text>us</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
+ <xsl:text>us</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
<xsl:template match="/command-line">
<xsl:text>ks=</xsl:text>
@@ -167,7 +167,7 @@ url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$release
</xsl:if>
%end
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
index d044f74..17841bf 100644
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -116,7 +116,7 @@ rm -f /etc/ostree/remotes.d/fedora-'<xsl:value-of select="os/version"/>'.conf
ostree remote add --if-not-exists --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-<xsl:value-of select="os/version"/>-primary fedora-<xsl:value-of select="os/version"/> 'https://dl.fedoraproject.org/atomic/repo/'
%end
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
index 9060877..7fee340 100644
--- a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
@@ -78,7 +78,7 @@
</xsl:choose>
</xsl:template>
- <xsl:template match="/install-script-config">
+ <xsl:template match="/install-script-config">
<xsl:if test="os/version < 6.0">
sc config TlntSvr start= auto
net user <xsl:value-of select="config/user-realname"/> <xsl:text> </xsl:text> <xsl:value-of select="config/admin-password"/> /add /passwordreq:no
@@ -98,7 +98,7 @@ bcdedit.exe -set TESTSIGNING ON
for %%i in ("<xsl:call-template name="post-install-drivers-disk"/>:<xsl:value-of select="config/post-install-drivers-location"/>\*.cmd") do cmd /c %%i
EXIT
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/microsoft.com/windows-reg-desktop.xml.in b/data/install-script/microsoft.com/windows-reg-desktop.xml.in
index 61fbb5b..dc8020b 100644
--- a/data/install-script/microsoft.com/windows-reg-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-reg-desktop.xml.in
@@ -17,14 +17,14 @@
<xsl:output method="text"/>
- <xsl:template match="/install-script-config">
+ <xsl:template match="/install-script-config">
Windows Registry Editor Version 5.00.
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon]
"DefaultUserName"="<xsl:value-of select="config/user-realname"/>"
"DefaultPassword"="<xsl:value-of select="config/admin-password"/>"
"AutoAdminLogon"="1"
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/microsoft.com/windows-sif-desktop.xml.in b/data/install-script/microsoft.com/windows-sif-desktop.xml.in
index 8494471..bfae72a 100644
--- a/data/install-script/microsoft.com/windows-sif-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-sif-desktop.xml.in
@@ -52,7 +52,7 @@
</xsl:choose>
</xsl:template>
- <xsl:template match="/install-script-config">
+ <xsl:template match="/install-script-config">
;SetupMgrTag
[Data]
AutoPartition=1
@@ -142,7 +142,7 @@
[WindowsFirewall.TurnOffFirewall]
Mode = 0
</xsl:if>
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/microsoft.com/windows-sif-jeos.xml.in b/data/install-script/microsoft.com/windows-sif-jeos.xml.in
index c2af8d2..392a690 100644
--- a/data/install-script/microsoft.com/windows-sif-jeos.xml.in
+++ b/data/install-script/microsoft.com/windows-sif-jeos.xml.in
@@ -21,7 +21,7 @@
<xsl:output method="text"/>
- <xsl:template match="/install-script-config">
+ <xsl:template match="/install-script-config">
;SetupMgrTag
[Data]
AutoPartition=1
@@ -66,7 +66,7 @@
[Networking]
InstallDefaultComponents=Yes
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
index 1769c2c..78b75db 100644
--- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
@@ -38,19 +38,19 @@
</xsl:choose>
</xsl:template>
- <xsl:template name="arch">
- <xsl:choose>
- <xsl:when test="config/hardware-arch = 'x86_64'">
- <xsl:text>amd64</xsl:text>
- </xsl:when>
- <xsl:when test="config/hardware-arch = 'i386'">
- <xsl:text>x86</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>x86</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
+ <xsl:template name="arch">
+ <xsl:choose>
+ <xsl:when test="config/hardware-arch = 'x86_64'">
+ <xsl:text>amd64</xsl:text>
+ </xsl:when>
+ <xsl:when test="config/hardware-arch = 'i386'">
+ <xsl:text>x86</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>x86</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
<xsl:template name="pre-install-drivers-disk">
<xsl:choose>
@@ -85,9 +85,9 @@
</xsl:choose>
</xsl:template>
- <xsl:template match="/install-script-config">
- <unattend xmlns="urn:schemas-microsoft-com:unattend">
- <settings pass="windowsPE">
+ <xsl:template match="/install-script-config">
+ <unattend xmlns="urn:schemas-microsoft-com:unattend">
+ <settings pass="windowsPE">
<component name="Microsoft-Windows-PnpCustomizationsWinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<xsl:attribute name="processorArchitecture">
<xsl:call-template name="arch"/>
@@ -98,131 +98,131 @@
</PathAndCredentials>
</DriverPaths>
</component>
- <component name="Microsoft-Windows-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <xsl:attribute name="processorArchitecture">
- <xsl:call-template name="arch"/>
- </xsl:attribute>
- <DiskConfiguration>
- <WillShowUI>OnError</WillShowUI>
- <Disk>
- <CreatePartitions>
- <CreatePartition>
- <Order>1</Order>
- <Size>1</Size>
- <Type>Primary</Type>
- </CreatePartition>
- </CreatePartitions>
- <DiskID>0</DiskID>
- <WillWipeDisk>true</WillWipeDisk>
- <ModifyPartitions>
- <ModifyPartition>
- <Active>true</Active>
- <Extend>true</Extend>
- <Format>NTFS</Format>
+ <component name="Microsoft-Windows-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <xsl:attribute name="processorArchitecture">
+ <xsl:call-template name="arch"/>
+ </xsl:attribute>
+ <DiskConfiguration>
+ <WillShowUI>OnError</WillShowUI>
+ <Disk>
+ <CreatePartitions>
+ <CreatePartition>
+ <Order>1</Order>
+ <Size>1</Size>
+ <Type>Primary</Type>
+ </CreatePartition>
+ </CreatePartitions>
+ <DiskID>0</DiskID>
+ <WillWipeDisk>true</WillWipeDisk>
+ <ModifyPartitions>
+ <ModifyPartition>
+ <Active>true</Active>
+ <Extend>true</Extend>
+ <Format>NTFS</Format>
<Label><xsl:call-template name="target-disk"/> drive</Label>
<Letter><xsl:call-template name="target-disk"/></Letter>
- <Order>1</Order>
- <PartitionID>1</PartitionID>
- </ModifyPartition>
- </ModifyPartitions>
- </Disk>
- </DiskConfiguration>
- <ImageInstall>
- <OSImage>
- <InstallTo>
- <DiskID>0</DiskID>
- <PartitionID>1</PartitionID>
- </InstallTo>
- <WillShowUI>OnError</WillShowUI>
- </OSImage>
- </ImageInstall>
- <UserData>
- <AcceptEula>true</AcceptEula>
+ <Order>1</Order>
+ <PartitionID>1</PartitionID>
+ </ModifyPartition>
+ </ModifyPartitions>
+ </Disk>
+ </DiskConfiguration>
+ <ImageInstall>
+ <OSImage>
+ <InstallTo>
+ <DiskID>0</DiskID>
+ <PartitionID>1</PartitionID>
+ </InstallTo>
+ <WillShowUI>OnError</WillShowUI>
+ </OSImage>
+ </ImageInstall>
+ <UserData>
+ <AcceptEula>true</AcceptEula>
<ProductKey>
<Key><xsl:value-of select="config/reg-product-key"/></Key>
</ProductKey>
- </UserData>
- </component>
- <component name="Microsoft-Windows-International-Core-WinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <xsl:attribute name="processorArchitecture">
- <xsl:call-template name="arch"/>
- </xsl:attribute>
- <SetupUILanguage>
- <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
- </SetupUILanguage>
- <SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale>
- <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
- <UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale>
- </component>
- </settings>
- <settings pass="oobeSystem">
- <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <xsl:attribute name="processorArchitecture">
- <xsl:call-template name="arch"/>
- </xsl:attribute>
- <UserAccounts>
- <AdministratorPassword>
- <Value><xsl:value-of select="config/admin-password"/></Value>
- <PlainText>true</PlainText>
- </AdministratorPassword>
+ </UserData>
+ </component>
+ <component name="Microsoft-Windows-International-Core-WinPE" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <xsl:attribute name="processorArchitecture">
+ <xsl:call-template name="arch"/>
+ </xsl:attribute>
+ <SetupUILanguage>
+ <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+ </SetupUILanguage>
+ <SystemLocale><xsl:value-of select="config/l10n-language"/></SystemLocale>
+ <UILanguage><xsl:call-template name="ui-language"/></UILanguage>
+ <UserLocale><xsl:value-of select="config/l10n-language"/></UserLocale>
+ </component>
+ </settings>
+ <settings pass="oobeSystem">
+ <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <xsl:attribute name="processorArchitecture">
+ <xsl:call-template name="arch"/>
+ </xsl:attribute>
+ <UserAccounts>
+ <AdministratorPassword>
+ <Value><xsl:value-of select="config/admin-password"/></Value>
+ <PlainText>true</PlainText>
+ </AdministratorPassword>
- <xsl:if test="count(config/user-login) > 0">
- <LocalAccounts>
- <LocalAccount wcm:action="add">
- <Password>
- <Value><xsl:value-of select="config/user-password"/></Value>
- <PlainText>true</PlainText>
- </Password>
- <Name><xsl:value-of select="config/user-login"/></Name>
- <DisplayName><xsl:value-of select="config/user-realname"/></DisplayName>
- <Group>Users</Group>
- </LocalAccount>
- </LocalAccounts>
- </xsl:if>
- </UserAccounts>
- <xsl:if test="count(config/user-login) > 0">
- <AutoLogon>
- <Password>
- <Value><xsl:value-of select="config/user-password"/></Value>
- <PlainText>true</PlainText>
- </Password>
- <Enabled>true</Enabled>
- <LogonCount>5</LogonCount>
- <Username><xsl:value-of select="config/user-login"/></Username>
- </AutoLogon>
- </xsl:if>
- <OOBE>
- <NetworkLocation>Work</NetworkLocation>
- <HideEULAPage>true</HideEULAPage>
- <ProtectYourPC>3</ProtectYourPC>
- <SkipMachineOOBE>true</SkipMachineOOBE>
- <SkipUserOOBE>true</SkipUserOOBE>
- </OOBE>
- <FirstLogonCommands>
- <SynchronousCommand wcm:action="add">
- <Order>1</Order>
- <Description>Turn Off Network Selection pop-up</Description>
- <CommandLine>cmd /c reg add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff"</CommandLine>
- </SynchronousCommand>
- <SynchronousCommand wcm:action="add">
- <Order>2</Order>
- <Description>Shutting down Windows</Description>
- <CommandLine>cmd /C shutdown /s /t 0</CommandLine>
- </SynchronousCommand>
- </FirstLogonCommands>
- </component>
- </settings>
- <settings pass="specialize">
- <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <xsl:attribute name="processorArchitecture">
- <xsl:call-template name="arch"/>
- </xsl:attribute>
+ <xsl:if test="count(config/user-login) > 0">
+ <LocalAccounts>
+ <LocalAccount wcm:action="add">
+ <Password>
+ <Value><xsl:value-of select="config/user-password"/></Value>
+ <PlainText>true</PlainText>
+ </Password>
+ <Name><xsl:value-of select="config/user-login"/></Name>
+ <DisplayName><xsl:value-of select="config/user-realname"/></DisplayName>
+ <Group>Users</Group>
+ </LocalAccount>
+ </LocalAccounts>
+ </xsl:if>
+ </UserAccounts>
+ <xsl:if test="count(config/user-login) > 0">
+ <AutoLogon>
+ <Password>
+ <Value><xsl:value-of select="config/user-password"/></Value>
+ <PlainText>true</PlainText>
+ </Password>
+ <Enabled>true</Enabled>
+ <LogonCount>5</LogonCount>
+ <Username><xsl:value-of select="config/user-login"/></Username>
+ </AutoLogon>
+ </xsl:if>
+ <OOBE>
+ <NetworkLocation>Work</NetworkLocation>
+ <HideEULAPage>true</HideEULAPage>
+ <ProtectYourPC>3</ProtectYourPC>
+ <SkipMachineOOBE>true</SkipMachineOOBE>
+ <SkipUserOOBE>true</SkipUserOOBE>
+ </OOBE>
+ <FirstLogonCommands>
+ <SynchronousCommand wcm:action="add">
+ <Order>1</Order>
+ <Description>Turn Off Network Selection pop-up</Description>
+ <CommandLine>cmd /c reg add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff"</CommandLine>
+ </SynchronousCommand>
+ <SynchronousCommand wcm:action="add">
+ <Order>2</Order>
+ <Description>Shutting down Windows</Description>
+ <CommandLine>cmd /C shutdown /s /t 0</CommandLine>
+ </SynchronousCommand>
+ </FirstLogonCommands>
+ </component>
+ </settings>
+ <settings pass="specialize">
+ <component name="Microsoft-Windows-Shell-Setup" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <xsl:attribute name="processorArchitecture">
+ <xsl:call-template name="arch"/>
+ </xsl:attribute>
- <ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
- </component>
- </settings>
- </unattend>
- </xsl:template>
+ <ProductKey><xsl:value-of select="config/reg-product-key"/></ProductKey>
+ </component>
+ </settings>
+ </unattend>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
index dfed40d..e2349d2 100644
--- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in
@@ -153,7 +153,7 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
" > /etc/gdm/custom.conf
%end
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
index 006e362..8c0b42d 100644
--- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
+++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in
@@ -100,7 +100,7 @@ reboot
@core
%end
- </xsl:template>
+ </xsl:template>
</xsl:stylesheet>
</template>
</install-script>
diff --git a/data/os/alpinelinux.org/alpinelinux-3.5.xml.in b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
index 31ec81a..41d89b4 100644
--- a/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
+++ b/data/os/alpinelinux.org/alpinelinux-3.5.xml.in
@@ -12,15 +12,15 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpus>1</n-cpus>
- <ram>134217728</ram>
- <storage>1073741824</storage>
+ <n-cpus>1</n-cpus>
+ <ram>134217728</ram>
+ <storage>1073741824</storage>
</minimum>
<recommended>
<cpu>1000000000</cpu>
- <n-cpus>1</n-cpus>
- <ram>805306368</ram>
- <storage>4294967296</storage>
+ <n-cpus>1</n-cpus>
+ <ram>805306368</ram>
+ <storage>4294967296</storage>
</recommended>
</resources>
<media arch="i686">
diff --git a/data/os/alpinelinux.org/alpinelinux-3.6.xml.in b/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
index 67e8f4d..911b7d1 100644
--- a/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
+++ b/data/os/alpinelinux.org/alpinelinux-3.6.xml.in
@@ -15,15 +15,15 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpus>1</n-cpus>
- <ram>134217728</ram>
- <storage>1073741824</storage>
+ <n-cpus>1</n-cpus>
+ <ram>134217728</ram>
+ <storage>1073741824</storage>
</minimum>
<recommended>
<cpu>1000000000</cpu>
- <n-cpus>1</n-cpus>
- <ram>805306368</ram>
- <storage>4294967296</storage>
+ <n-cpus>1</n-cpus>
+ <ram>805306368</ram>
+ <storage>4294967296</storage>
</recommended>
</resources>
<media arch="i686">
diff --git a/data/os/alpinelinux.org/alpinelinux-3.7.xml.in b/data/os/alpinelinux.org/alpinelinux-3.7.xml.in
index 9e2cdfb..5549376 100644
--- a/data/os/alpinelinux.org/alpinelinux-3.7.xml.in
+++ b/data/os/alpinelinux.org/alpinelinux-3.7.xml.in
@@ -15,15 +15,15 @@
<resources arch="all">
<minimum>
<cpu>1000000000</cpu>
- <n-cpus>1</n-cpus>
- <ram>134217728</ram>
- <storage>1073741824</storage>
+ <n-cpus>1</n-cpus>
+ <ram>134217728</ram>
+ <storage>1073741824</storage>
</minimum>
<recommended>
<cpu>1000000000</cpu>
- <n-cpus>1</n-cpus>
- <ram>805306368</ram>
- <storage>4294967296</storage>
+ <n-cpus>1</n-cpus>
+ <ram>805306368</ram>
+ <storage>4294967296</storage>
</recommended>
</resources>
<media arch="i686">
diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
index f3a0d58..7ff402b 100644
--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -63,7 +63,7 @@
<variant id="universal-netinst"/>
<url>http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-cd/debian-9.8.0-amd64-netinst.iso</url>
<iso>
- <volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id>
+ <volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id>
</iso>
<kernel>install.amd/vmlinuz</kernel>
<initrd>install.amd/initrd.gz</initrd>
@@ -72,7 +72,7 @@
<variant id="universal-netinst"/>
<url>http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-cd/debian-9.8.0-arm64-netinst.iso</url>
<iso>
- <volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id>
+ <volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id>
</iso>
<kernel>install.arm64/vmlinuz</kernel>
<initrd>install.arm64/initrd.gz</initrd>
@@ -81,7 +81,7 @@
<variant id="universal-netinst"/>
<url>http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-cd/debian-9.8.0-armhf-netinst.iso</url>
<iso>
- <volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id>
+ <volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id>
</iso>
<kernel>install.armhf/vmlinuz</kernel>
<initrd>install.armhf/initrd.gz</initrd>
@@ -101,7 +101,7 @@
<variant id="universal"/>
<url>http://cdimage.debian.org/cdimage/release/9.8.0/amd64/iso-dvd/debian-9.8.0-amd64-DVD-1.iso</url>
<iso>
- <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id>
+ <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id>
</iso>
<kernel>install.amd/vmlinuz</kernel>
<initrd>install.amd/initrd.gz</initrd>
@@ -110,7 +110,7 @@
<variant id="universal"/>
<url>http://cdimage.debian.org/cdimage/release/9.8.0/arm64/iso-dvd/debian-9.8.0-arm64-DVD-1.iso</url>
<iso>
- <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id>
+ <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id>
</iso>
<kernel>install.arm64/vmlinuz</kernel>
<initrd>install.arm64/initrd.gz</initrd>
@@ -119,7 +119,7 @@
<variant id="universal"/>
<url>http://cdimage.debian.org/cdimage/release/9.8.0/armhf/iso-dvd/debian-9.8.0-armhf-DVD-1.iso</url>
<iso>
- <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id>
+ <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id>
</iso>
<kernel>install.armhf/vmlinuz</kernel>
<initrd>install.armhf/initrd.gz</initrd>
diff --git a/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in b/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in
index edfdec1..38a445d 100644
--- a/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in
+++ b/data/os/dragonflybsd.org/dragonflybsd-3.4.1.xml.in
@@ -10,6 +10,6 @@
<_vendor>DragonFlyBSD Project</_vendor>
<upgrades id="http://dragonflybsd.org/dragonflybsd/3.2.1"/>
- <release-date>2013-04-29</release-date>
+ <release-date>2013-04-29</release-date>
</os>
</libosinfo>
diff --git a/data/os/fedoraproject.org/fedora-10.xml.in b/data/os/fedoraproject.org/fedora-10.xml.in
index 9ce4d62..49a9109 100644
--- a/data/os/fedoraproject.org/fedora-10.xml.in
+++ b/data/os/fedoraproject.org/fedora-10.xml.in
@@ -336,17 +336,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>10</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>10</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/10/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>10</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>10</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-11.xml.in b/data/os/fedoraproject.org/fedora-11.xml.in
index ff2a21e..cd8f206 100644
--- a/data/os/fedoraproject.org/fedora-11.xml.in
+++ b/data/os/fedoraproject.org/fedora-11.xml.in
@@ -334,17 +334,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>11</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>11</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/11/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>11</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>11</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-12.xml.in b/data/os/fedoraproject.org/fedora-12.xml.in
index ce50728..b549fdf 100644
--- a/data/os/fedoraproject.org/fedora-12.xml.in
+++ b/data/os/fedoraproject.org/fedora-12.xml.in
@@ -294,17 +294,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>12</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>12</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/12/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>12</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>12</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-13.xml.in b/data/os/fedoraproject.org/fedora-13.xml.in
index dfac0eb..535c620 100644
--- a/data/os/fedoraproject.org/fedora-13.xml.in
+++ b/data/os/fedoraproject.org/fedora-13.xml.in
@@ -210,17 +210,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>13</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>13</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/13/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>13</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>13</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-14.xml.in b/data/os/fedoraproject.org/fedora-14.xml.in
index 6cd0099..01223fe 100644
--- a/data/os/fedoraproject.org/fedora-14.xml.in
+++ b/data/os/fedoraproject.org/fedora-14.xml.in
@@ -210,17 +210,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>14</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>14</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/14/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>14</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>14</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-15.xml.in b/data/os/fedoraproject.org/fedora-15.xml.in
index d3ee3c1..1320605 100644
--- a/data/os/fedoraproject.org/fedora-15.xml.in
+++ b/data/os/fedoraproject.org/fedora-15.xml.in
@@ -88,17 +88,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>15</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>15</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>15</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>15</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-16.xml.in b/data/os/fedoraproject.org/fedora-16.xml.in
index c915a25..5872a2a 100644
--- a/data/os/fedoraproject.org/fedora-16.xml.in
+++ b/data/os/fedoraproject.org/fedora-16.xml.in
@@ -88,17 +88,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>16</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>16</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/16/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>16</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>16</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-17.xml.in b/data/os/fedoraproject.org/fedora-17.xml.in
index 9450a08..6175845 100644
--- a/data/os/fedoraproject.org/fedora-17.xml.in
+++ b/data/os/fedoraproject.org/fedora-17.xml.in
@@ -92,17 +92,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>17</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>17</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/17/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>17</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>17</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-18.xml.in b/data/os/fedoraproject.org/fedora-18.xml.in
index b31573c..db8be83 100644
--- a/data/os/fedoraproject.org/fedora-18.xml.in
+++ b/data/os/fedoraproject.org/fedora-18.xml.in
@@ -88,17 +88,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>18</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>18</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/18/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>18</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>18</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-23.xml.in b/data/os/fedoraproject.org/fedora-23.xml.in
index 48c271b..9a3ce13 100644
--- a/data/os/fedoraproject.org/fedora-23.xml.in
+++ b/data/os/fedoraproject.org/fedora-23.xml.in
@@ -37,7 +37,7 @@
<device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
<device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
<!-- virtio-1.0-gpu kmod is present, but mesa is not functional so
- pretend its just not available until F24 to avoid bug reports -->
+ pretend its just not available until F24 to avoid bug reports -->
<device id="http://qemu.org/chipset/x86/q35"/> <!-- qemu-x86-q35 -->
<device id="http://pcisig.com/pci/8086/10d3"/> <!-- e1000e -->
<device id="http://pcisig.com/pci/8086/293e"/> <!-- ich9-hda -->
diff --git a/data/os/fedoraproject.org/fedora-25.xml.in b/data/os/fedoraproject.org/fedora-25.xml.in
index 64ae1de..41a0544 100644
--- a/data/os/fedoraproject.org/fedora-25.xml.in
+++ b/data/os/fedoraproject.org/fedora-25.xml.in
@@ -86,7 +86,7 @@
https://fedorahosted.org/rel-eng/ticket/6173
-->
- <volume-size>2113044480</volume-size>
+ <volume-size>2113044480</volume-size>
</iso>
<kernel>isolinux/vmlinuz</kernel>
<initrd>isolinux/initrd.img</initrd>
diff --git a/data/os/fedoraproject.org/fedora-7.xml.in b/data/os/fedoraproject.org/fedora-7.xml.in
index 03b15ba..0b0701d 100644
--- a/data/os/fedoraproject.org/fedora-7.xml.in
+++ b/data/os/fedoraproject.org/fedora-7.xml.in
@@ -97,17 +97,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>7</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>7</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/7/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>7</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>7</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-8.xml.in b/data/os/fedoraproject.org/fedora-8.xml.in
index 8aae791..b10bcf4 100644
--- a/data/os/fedoraproject.org/fedora-8.xml.in
+++ b/data/os/fedoraproject.org/fedora-8.xml.in
@@ -109,17 +109,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>8</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>8</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/8/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>8</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>8</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/fedoraproject.org/fedora-9.xml.in b/data/os/fedoraproject.org/fedora-9.xml.in
index fff246d..cb100a2 100644
--- a/data/os/fedoraproject.org/fedora-9.xml.in
+++ b/data/os/fedoraproject.org/fedora-9.xml.in
@@ -350,17 +350,17 @@
<tree arch="i686">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/i386/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>9</version>
- <arch>i386</arch>
+ <family>Fedora</family>
+ <version>9</version>
+ <arch>i386</arch>
</treeinfo>
</tree>
<tree arch="x86_64">
<url>http://archive.fedoraproject.org/pub/archive/fedora/linux/releases/9/Fedora/x86_64/os/</url>
<treeinfo>
- <family>Fedora</family>
- <version>9</version>
- <arch>x86_64</arch>
+ <family>Fedora</family>
+ <version>9</version>
+ <arch>x86_64</arch>
</treeinfo>
</tree>
diff --git a/data/os/freebsd.org/freebsd-12.0.xml.in b/data/os/freebsd.org/freebsd-12.0.xml.in
index 9ed317a..d084b58 100644
--- a/data/os/freebsd.org/freebsd-12.0.xml.in
+++ b/data/os/freebsd.org/freebsd-12.0.xml.in
@@ -35,7 +35,7 @@
</iso>
</media>
<media arch="i686">
- <url>https://download.freebsd.org/ftp/releases/i386/i386/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-i386-disc1.iso</url>
+ <url>https://download.freebsd.org/ftp/releases/i386/i386/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-i386-disc1.iso</url>
<iso>
<system-id>FreeBSD</system-id>
<volume-id>12_0_RELEASE_I386_CD</volume-id>
diff --git a/data/os/gentoo.org/gentoo-rolling.xml.in b/data/os/gentoo.org/gentoo-rolling.xml.in
index 6b8159b..8ba9187 100644
--- a/data/os/gentoo.org/gentoo-rolling.xml.in
+++ b/data/os/gentoo.org/gentoo-rolling.xml.in
@@ -40,7 +40,7 @@
<resources arch="all">
<minimum>
<ram>268435456</ram>
- <storage>2952790016</storage>
+ <storage>2952790016</storage>
</minimum>
</resources>
diff --git a/data/os/openbsd.org/openbsd-4.2.xml.in b/data/os/openbsd.org/openbsd-4.2.xml.in
index 5ce9d7a..d499713 100644
--- a/data/os/openbsd.org/openbsd-4.2.xml.in
+++ b/data/os/openbsd.org/openbsd-4.2.xml.in
@@ -14,19 +14,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 4.2 Install CD</volume-id>
- <application-id>OpenBSD 4.2 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 4.2 Install CD</volume-id>
+ <application-id>OpenBSD 4.2 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 4.2 Install CD</volume-id>
- <application-id>OpenBSD 4.2 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2007 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 4.2 Install CD</volume-id>
+ <application-id>OpenBSD 4.2 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-4.3.xml.in b/data/os/openbsd.org/openbsd-4.3.xml.in
index eadb220..a971d09 100644
--- a/data/os/openbsd.org/openbsd-4.3.xml.in
+++ b/data/os/openbsd.org/openbsd-4.3.xml.in
@@ -16,19 +16,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 4.3 Install CD</volume-id>
- <application-id>OpenBSD 4.3 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 4.3 Install CD</volume-id>
+ <application-id>OpenBSD 4.3 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 4.3 Install CD</volume-id>
- <application-id>OpenBSD 4.3 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 4.3 Install CD</volume-id>
+ <application-id>OpenBSD 4.3 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-4.4.xml.in b/data/os/openbsd.org/openbsd-4.4.xml.in
index d28eaf8..f1d4e6c 100644
--- a/data/os/openbsd.org/openbsd-4.4.xml.in
+++ b/data/os/openbsd.org/openbsd-4.4.xml.in
@@ -16,19 +16,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 4.4 Install CD</volume-id>
- <application-id>OpenBSD 4.4 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 4.4 Install CD</volume-id>
+ <application-id>OpenBSD 4.4 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 4.4 Install CD</volume-id>
- <application-id>OpenBSD 4.4 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2008 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 4.4 Install CD</volume-id>
+ <application-id>OpenBSD 4.4 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-4.5.xml.in b/data/os/openbsd.org/openbsd-4.5.xml.in
index f408ccc..32130fe 100644
--- a/data/os/openbsd.org/openbsd-4.5.xml.in
+++ b/data/os/openbsd.org/openbsd-4.5.xml.in
@@ -16,19 +16,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 4.5 Install CD</volume-id>
- <application-id>OpenBSD 4.5 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 4.5 Install CD</volume-id>
+ <application-id>OpenBSD 4.5 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 4.5 Install CD</volume-id>
- <application-id>OpenBSD 4.5 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2009 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 4.5 Install CD</volume-id>
+ <application-id>OpenBSD 4.5 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-4.8.xml.in b/data/os/openbsd.org/openbsd-4.8.xml.in
index 116ddd5..928f079 100644
--- a/data/os/openbsd.org/openbsd-4.8.xml.in
+++ b/data/os/openbsd.org/openbsd-4.8.xml.in
@@ -16,19 +16,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 4.8 Install CD</volume-id>
- <application-id>OpenBSD 4.8 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 4.8 Install CD</volume-id>
+ <application-id>OpenBSD 4.8 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 4.8 Install CD</volume-id>
- <application-id>OpenBSD 4.8 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2010 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 4.8 Install CD</volume-id>
+ <application-id>OpenBSD 4.8 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-4.9.xml.in b/data/os/openbsd.org/openbsd-4.9.xml.in
index af70769..23cb033 100644
--- a/data/os/openbsd.org/openbsd-4.9.xml.in
+++ b/data/os/openbsd.org/openbsd-4.9.xml.in
@@ -20,19 +20,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 4.9 Install CD</volume-id>
- <application-id>OpenBSD 4.9 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 4.9 Install CD</volume-id>
+ <application-id>OpenBSD 4.9 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 4.9 Install CD</volume-id>
- <application-id>OpenBSD 4.9 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 4.9 Install CD</volume-id>
+ <application-id>OpenBSD 4.9 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.0.xml.in b/data/os/openbsd.org/openbsd-5.0.xml.in
index ef3f3e7..38f2e75 100644
--- a/data/os/openbsd.org/openbsd-5.0.xml.in
+++ b/data/os/openbsd.org/openbsd-5.0.xml.in
@@ -16,19 +16,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.0 Install CD</volume-id>
- <application-id>OpenBSD 5.0 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.0 Install CD</volume-id>
+ <application-id>OpenBSD 5.0 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.0 Install CD</volume-id>
- <application-id>OpenBSD 5.0 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2011 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.0 Install CD</volume-id>
+ <application-id>OpenBSD 5.0 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.1.xml.in b/data/os/openbsd.org/openbsd-5.1.xml.in
index 4395096..cb650d4 100644
--- a/data/os/openbsd.org/openbsd-5.1.xml.in
+++ b/data/os/openbsd.org/openbsd-5.1.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.1 Install CD</volume-id>
- <application-id>OpenBSD 5.1 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.1 Install CD</volume-id>
+ <application-id>OpenBSD 5.1 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.1 Install CD</volume-id>
- <application-id>OpenBSD 5.1 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.1 Install CD</volume-id>
+ <application-id>OpenBSD 5.1 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.2.xml.in b/data/os/openbsd.org/openbsd-5.2.xml.in
index 2fd52d9..12549db 100644
--- a/data/os/openbsd.org/openbsd-5.2.xml.in
+++ b/data/os/openbsd.org/openbsd-5.2.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.2 Install CD</volume-id>
- <application-id>OpenBSD 5.2 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.2 Install CD</volume-id>
+ <application-id>OpenBSD 5.2 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.2 Install CD</volume-id>
- <application-id>OpenBSD 5.2 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2012 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.2 Install CD</volume-id>
+ <application-id>OpenBSD 5.2 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.3.xml.in b/data/os/openbsd.org/openbsd-5.3.xml.in
index 2a276df..de43d57 100644
--- a/data/os/openbsd.org/openbsd-5.3.xml.in
+++ b/data/os/openbsd.org/openbsd-5.3.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.3 Install CD</volume-id>
- <application-id>OpenBSD 5.3 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.3 Install CD</volume-id>
+ <application-id>OpenBSD 5.3 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.3 Install CD</volume-id>
- <application-id>OpenBSD 5.3 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.3 Install CD</volume-id>
+ <application-id>OpenBSD 5.3 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.4.xml.in b/data/os/openbsd.org/openbsd-5.4.xml.in
index b3fb08f..fc08332 100644
--- a/data/os/openbsd.org/openbsd-5.4.xml.in
+++ b/data/os/openbsd.org/openbsd-5.4.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.4 Install CD</volume-id>
- <application-id>OpenBSD 5.4 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.4 Install CD</volume-id>
+ <application-id>OpenBSD 5.4 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.4 Install CD</volume-id>
- <application-id>OpenBSD 5.4 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2013 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.4 Install CD</volume-id>
+ <application-id>OpenBSD 5.4 amd64 Install CD</application-id>
</iso>
</media>
diff --git a/data/os/openbsd.org/openbsd-5.5.xml.in b/data/os/openbsd.org/openbsd-5.5.xml.in
index 155e3da..47c2a5a 100644
--- a/data/os/openbsd.org/openbsd-5.5.xml.in
+++ b/data/os/openbsd.org/openbsd-5.5.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.5 Install CD</volume-id>
- <application-id>OpenBSD 5.5 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.5 Install CD</volume-id>
+ <application-id>OpenBSD 5.5 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.5 Install CD</volume-id>
- <application-id>OpenBSD 5.5 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.5 Install CD</volume-id>
+ <application-id>OpenBSD 5.5 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.6.xml.in b/data/os/openbsd.org/openbsd-5.6.xml.in
index fed2e34..39efb88 100644
--- a/data/os/openbsd.org/openbsd-5.6.xml.in
+++ b/data/os/openbsd.org/openbsd-5.6.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.6 Install CD</volume-id>
- <application-id>OpenBSD 5.6 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.6 Install CD</volume-id>
+ <application-id>OpenBSD 5.6 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.6 Install CD</volume-id>
- <application-id>OpenBSD 5.6 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2014 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.6 Install CD</volume-id>
+ <application-id>OpenBSD 5.6 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.7.xml.in b/data/os/openbsd.org/openbsd-5.7.xml.in
index 666ffc8..187e3e9 100644
--- a/data/os/openbsd.org/openbsd-5.7.xml.in
+++ b/data/os/openbsd.org/openbsd-5.7.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.7 Install CD</volume-id>
- <application-id>OpenBSD 5.7 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.7 Install CD</volume-id>
+ <application-id>OpenBSD 5.7 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.7 Install CD</volume-id>
- <application-id>OpenBSD 5.7 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.7 Install CD</volume-id>
+ <application-id>OpenBSD 5.7 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.8.xml.in b/data/os/openbsd.org/openbsd-5.8.xml.in
index 4f120d0..21c3643 100644
--- a/data/os/openbsd.org/openbsd-5.8.xml.in
+++ b/data/os/openbsd.org/openbsd-5.8.xml.in
@@ -15,19 +15,19 @@
<media arch="i686">
<iso>
- <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.8 Install CD</volume-id>
- <application-id>OpenBSD 5.8 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.8 Install CD</volume-id>
+ <application-id>OpenBSD 5.8 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<iso>
- <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.8 Install CD</volume-id>
- <application-id>OpenBSD 5.8 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2015 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.8 Install CD</volume-id>
+ <application-id>OpenBSD 5.8 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-5.9.xml.in b/data/os/openbsd.org/openbsd-5.9.xml.in
index a94c9b7..aad3f93 100644
--- a/data/os/openbsd.org/openbsd-5.9.xml.in
+++ b/data/os/openbsd.org/openbsd-5.9.xml.in
@@ -15,20 +15,20 @@
<media arch="i686">
<url>https://ftp.eu.openbsd.org/pub/OpenBSD/5.9/i386/install59.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 5.9 Install CD</volume-id>
- <application-id>OpenBSD 5.9 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 5.9 Install CD</volume-id>
+ <application-id>OpenBSD 5.9 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<url>https://ftp.eu.openbsd.org/pub/OpenBSD/5.9/amd64/install59.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 5.9 Install CD</volume-id>
- <application-id>OpenBSD 5.9 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 5.9 Install CD</volume-id>
+ <application-id>OpenBSD 5.9 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-6.0.xml.in b/data/os/openbsd.org/openbsd-6.0.xml.in
index 3fc7551..52d8098 100644
--- a/data/os/openbsd.org/openbsd-6.0.xml.in
+++ b/data/os/openbsd.org/openbsd-6.0.xml.in
@@ -15,20 +15,20 @@
<media arch="i686">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.0/i386/install60.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 6.0 Install CD</volume-id>
- <application-id>OpenBSD 6.0 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 6.0 Install CD</volume-id>
+ <application-id>OpenBSD 6.0 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.0/amd64/install60.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 6.0 Install CD</volume-id>
- <application-id>OpenBSD 6.0 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2016 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 6.0 Install CD</volume-id>
+ <application-id>OpenBSD 6.0 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-6.1.xml.in b/data/os/openbsd.org/openbsd-6.1.xml.in
index f98c034..7d9b608 100644
--- a/data/os/openbsd.org/openbsd-6.1.xml.in
+++ b/data/os/openbsd.org/openbsd-6.1.xml.in
@@ -15,20 +15,20 @@
<media arch="i686">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.1/i386/install61.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 6.1 Install CD</volume-id>
- <application-id>OpenBSD 6.1 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 6.1 Install CD</volume-id>
+ <application-id>OpenBSD 6.1 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.1/amd64/install61.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 6.1 Install CD</volume-id>
- <application-id>OpenBSD 6.1 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 6.1 Install CD</volume-id>
+ <application-id>OpenBSD 6.1 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-6.2.xml.in b/data/os/openbsd.org/openbsd-6.2.xml.in
index 7cdebd2..5600c51 100644
--- a/data/os/openbsd.org/openbsd-6.2.xml.in
+++ b/data/os/openbsd.org/openbsd-6.2.xml.in
@@ -15,20 +15,20 @@
<media arch="i686">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/i386/install62.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 6.2 Install CD</volume-id>
- <application-id>OpenBSD 6.2 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 6.2 Install CD</volume-id>
+ <application-id>OpenBSD 6.2 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/amd64/install62.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 6.2 Install CD</volume-id>
- <application-id>OpenBSD 6.2 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2017 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 6.2 Install CD</volume-id>
+ <application-id>OpenBSD 6.2 amd64 Install CD</application-id>
</iso>
</media>
</os>
diff --git a/data/os/openbsd.org/openbsd-6.3.xml.in b/data/os/openbsd.org/openbsd-6.3.xml.in
index ec59c8e..21ea01a 100644
--- a/data/os/openbsd.org/openbsd-6.3.xml.in
+++ b/data/os/openbsd.org/openbsd-6.3.xml.in
@@ -15,20 +15,20 @@
<media arch="i686">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.3/i386/install63.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/i386 6.3 Install CD</volume-id>
- <application-id>OpenBSD 6.3 i386 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/i386 6.3 Install CD</volume-id>
+ <application-id>OpenBSD 6.3 i386 Install CD</application-id>
</iso>
</media>
<media arch="x86_64">
<url>https://fastly.cdn.openbsd.org/pub/OpenBSD/6.3/amd64/install63.iso</url>
<iso>
- <publisher-id>Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project</publisher-id>
- <system-id>OpenBSD</system-id>
- <volume-id>OpenBSD/amd64 6.3 Install CD</volume-id>
- <application-id>OpenBSD 6.3 amd64 Install CD</application-id>
+ <publisher-id>Copyright \(c\) 2018 Theo de Raadt, The OpenBSD project</publisher-id>
+ <system-id>OpenBSD</system-id>
+ <volume-id>OpenBSD/amd64 6.3 Install CD</volume-id>
+ <application-id>OpenBSD 6.3 amd64 Install CD</application-id>
</iso>
</media>
</os>
--
2.20.1
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
