Guido Günther · Guido Günther · Guido Günther · Guido Günther · Guido Günther · Guido Günther
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -61,7 +61,7 @@ volgroup VolGroup00 --pesize=32768 pv.2
 logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
 logvol / --fstype xfs --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow

-ostreesetup --osname="fedora-workstation" --remote="fedora-workstation" --url="file:///ostree/repo" --ref="fedora/<xsl:value-of select="os/version"/>/<xsl:value-of select="config/hardware-arch"/>/workstation" --nogpg
+ostreesetup --osname="fedora-workstation" --remote="fedora-<xsl:value-of select="os/version"/>" --url="file:///ostree/repo" --ref="fedora/<xsl:value-of select="os/version"/>/<xsl:value-of select="config/hardware-arch"/>/workstation" --nogpg
 graphical
 reboot

@@ -96,8 +96,8 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
 [debug]
 " > /etc/gdm/custom.conf

-rm -f /etc/ostree/remotes.d/fedora-workstation.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-worstation-<xsl:value-of select="os/version"/> 'https://kojipkgs.fedoraproject.org/atomic/workstation/'
+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>

--- a/data/os/alpinelinux.org/alpinelinux-3.8.xml.in
+++ b/data/os/alpinelinux.org/alpinelinux-3.8.xml.in
+<?xml version="1.0" encoding="UTF-8"?>
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://alpinelinux.org/alpinelinux/3.8">
+    <short-id>alpinelinux3.8</short-id>
+    <_name>Alpine Linux 3.8</_name>
+    <version>3.8</version>
+    <_vendor>Alpine Linux Project</_vendor>
+    <family>linux</family>
+    <distro>alpinelinux</distro>
+    <upgrades id="http://alpinelinux.org/alpinelinux/3.7"/>
+    <derives-from id="http://alpinelinux.org/alpinelinux/3.7"/>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <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>
+      </recommended>
+    </resources>
+    <media arch="i686">
+      <iso>
+        <volume-id>alpine-.* 3.8.\d x86$</volume-id>
+      </iso>
+    </media>
+    <media arch="x86_64">
+      <iso>
+        <volume-id>alpine-.* 3.8.\d x86_64$</volume-id>
+      </iso>
+    </media>
+    <media arch="ppc64le">
+      <iso>
+        <volume-id>alpine-.* 3.8.\d ppc64le$</volume-id>
+      </iso>
+    </media>
+    <media arch="s390x">
+      <iso>
+        <volume-id>alpine-.* 3.8.\d s390x$</volume-id>
+      </iso>
+    </media>
+   </os>
+ </libosinfo>
--- a/data/os/altlinux.org/altlinux-4.0.xml.in
+++ b/data/os/altlinux.org/altlinux-4.0.xml.in
@@ -16,7 +16,7 @@
      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.0/Server/current/iso/altlinux-4.0.1-server-i586-install-cd.iso</url>
      <iso>
        <volume-id>^("Terminal"|Server|"Desktop\ Personal")$</volume-id>
-        <publisher-id>ALT Linux( Team)?</publisher-id>
+        <publisher-id>"ALT Linux( Team)?"</publisher-id>
      </iso>
      <kernel>isolinux/alt0/vmlinuz</kernel>
      <initrd>isolinux/alt0/full.cz</initrd>

--- a/data/os/altlinux.org/altlinux-4.1.xml.in
+++ b/data/os/altlinux.org/altlinux-4.1.xml.in
@@ -16,7 +16,7 @@
      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-i586-install-dvd5.iso</url>
      <iso>
        <volume-id>^"Desktop"$</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
+        <publisher-id>"ALT Linux Team"</publisher-id>
      </iso>
      <kernel>isolinux/alt0/vmlinuz</kernel>
      <initrd>isolinux/alt0/full.cz</initrd>
@@ -25,7 +25,7 @@
      <url>http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-x86_64-install-dvd5.iso</url>
      <iso>
        <volume-id>^"Desktop"$</volume-id>
-        <publisher-id>ALT Linux Team</publisher-id>
+        <publisher-id>"ALT Linux Team"</publisher-id>
      </iso>
      <kernel>isolinux/alt0/vmlinuz</kernel>
      <initrd>isolinux/alt0/full.cz</initrd>

--- a/data/os/altlinux.org/altlinux-5.0.xml.in
+++ b/data/os/altlinux.org/altlinux-5.0.xml.in
@@ -14,8 +14,8 @@
    <release-date>2009-10-29</release-date>

    <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
    </devices>

    <media arch="i686">

--- a/data/os/altlinux.org/altlinux-6.0.xml.in
+++ b/data/os/altlinux.org/altlinux-6.0.xml.in
@@ -14,7 +14,7 @@
    <release-date>2011-10-26</release-date>

    <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
    </devices>

    <media arch="i686">

--- a/data/os/centos.org/centos-6.9.xml.in
+++ b/data/os/centos.org/centos-6.9.xml.in
@@ -103,7 +103,7 @@
    </media>

    <tree arch="i686">
-      <url>http://mirror.centos.org/centos/6.9/os/i386</url>
+      <url>http://vault.centos.org/6.9/os/i386/</url>
      <treeinfo>
        <family>CentOS</family>
        <version>6.9</version>
@@ -111,7 +111,7 @@
      </treeinfo>
    </tree>
    <tree arch="x86_64">
-      <url>http://mirror.centos.org/centos/6.9/os/x86_64</url>
+      <url>http://vault.centos.org/6.9/os/x86_64/</url>
      <treeinfo>
        <family>CentOS</family>
        <version>6.9</version>

--- a/data/os/centos.org/centos-7.0.xml.in
+++ b/data/os/centos.org/centos-7.0.xml.in
@@ -13,15 +13,54 @@

    <release-date>2014-07-07</release-date>

+    <variant id="live-gnome">
+      <_name>CentOS 7.0 (GNOME)</_name>
+    </variant>
+    <variant id="live-kde">
+      <_name>CentOS 7.0 (KDE)</_name>
+    </variant>
+
    <media arch="x86_64">
+      <url>https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-DVD.iso</url>
      <iso>
        <system-id>LINUX</system-id>
-        <volume-id>.*CentOS 7 x86_64.*</volume-id>
+        <volume-id>CentOS 7 x86_64</volume-id>
      </iso>
      <kernel>isolinux/vmlinuz</kernel>
      <initrd>isolinux/initrd.img</initrd>
    </media>

+    <media arch="x86_64" live="true">
+      <variant id="live-gnome"/>
+      <url>https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveGNOME.iso</url>
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS-7-x86_64-LiveGNOME*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <media arch="x86_64" live="true">
+      <variant id="live-kde"/>
+      <url>https://buildlogs.centos.org/rolling/7/isos/x86_64/CentOS-7-x86_64-LiveKDE.iso</url>
+      <iso>
+        <system-id>LINUX</system-id>
+        <volume-id>CentOS-7-x86_64-LiveKDE*</volume-id>
+      </iso>
+      <kernel>isolinux/vmlinuz0</kernel>
+      <initrd>isolinux/initrd0.img</initrd>
+    </media>
+
+    <tree arch="x86_64">
+      <url>http://mirror.centos.org/centos-7/7/os/x86_64/</url>
+      <treeinfo>
+        <family>CentOS</family>
+        <version>7.0</version>
+        <arch>x86_64</arch>
+      </treeinfo>
+    </tree>
+
    <resources arch="all">
      <minimum>
        <n-cpus>1</n-cpus>

--- a/data/os/cirros-cloud.net/cirros-0.3.0.xml.in
+++ b/data/os/cirros-cloud.net/cirros-0.3.0.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://cirros-cloud.net/cirros/0.3.0">
+    <short-id>cirros0.3.0</short-id>
+    <_name>CirrOS 0.3.0</_name>
+    <version>0.3.0</version>
+    <_vendor>CirrOS</_vendor>
+    <family>linux</family>
+    <distro>cirros</distro>
+
+    <release-date>2011-10-20</release-date>
+    <eol-date>2013-02-08</eol-date>
+
+    <devices>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>52428800</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
--- a/data/os/cirros-cloud.net/cirros-0.3.1.xml.in
+++ b/data/os/cirros-cloud.net/cirros-0.3.1.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://cirros-cloud.net/cirros/0.3.1">
+    <short-id>cirros0.3.1</short-id>
+    <_name>CirrOS 0.3.1</_name>
+    <version>0.3.1</version>
+    <_vendor>CirrOS</_vendor>
+    <family>linux</family>
+    <distro>cirros</distro>
+    <upgrades id="http://cirros-cloud.net/cirros/0.3.0"/>
+    <derives-from id="http://cirros-cloud.net/cirros/0.3.0"/>
+
+    <release-date>2013-02-08</release-date>
+    <eol-date>2014-03-19</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>52428800</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
--- a/data/os/cirros-cloud.net/cirros-0.3.2.xml.in
+++ b/data/os/cirros-cloud.net/cirros-0.3.2.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://cirros-cloud.net/cirros/0.3.2">
+    <short-id>cirros0.3.2</short-id>
+    <_name>CirrOS 0.3.2</_name>
+    <version>0.3.2</version>
+    <_vendor>CirrOS</_vendor>
+    <family>linux</family>
+    <distro>cirros</distro>
+    <upgrades id="http://cirros-cloud.net/cirros/0.3.1"/>
+    <derives-from id="http://cirros-cloud.net/cirros/0.3.1"/>
+
+    <release-date>2014-03-19</release-date>
+    <eol-date>2014-09-08</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>52428800</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
--- a/data/os/cirros-cloud.net/cirros-0.3.3.xml.in
+++ b/data/os/cirros-cloud.net/cirros-0.3.3.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://cirros-cloud.net/cirros/0.3.3">
+    <short-id>cirros0.3.3</short-id>
+    <_name>CirrOS 0.3.3</_name>
+    <version>0.3.3</version>
+    <_vendor>CirrOS</_vendor>
+    <family>linux</family>
+    <distro>cirros</distro>
+    <upgrades id="http://cirros-cloud.net/cirros/0.3.2"/>
+    <derives-from id="http://cirros-cloud.net/cirros/0.3.2"/>
+
+    <release-date>2014-09-08</release-date>
+    <eol-date>2015-04-22</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>52428800</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
--- a/data/os/cirros-cloud.net/cirros-0.3.4.xml.in
+++ b/data/os/cirros-cloud.net/cirros-0.3.4.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://cirros-cloud.net/cirros/0.3.4">
+    <short-id>cirros0.3.4</short-id>
+    <_name>CirrOS 0.3.4</_name>
+    <version>0.3.4</version>
+    <_vendor>CirrOS</_vendor>
+    <family>linux</family>
+    <distro>cirros</distro>
+    <upgrades id="http://cirros-cloud.net/cirros/0.3.3"/>
+    <derives-from id="http://cirros-cloud.net/cirros/0.3.3"/>
+
+    <release-date>2015-04-22</release-date>
+    <eol-date>2017-02-14</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>52428800</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
--- a/data/os/cirros-cloud.net/cirros-0.3.5.xml.in
+++ b/data/os/cirros-cloud.net/cirros-0.3.5.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://cirros-cloud.net/cirros/0.3.5">
+    <short-id>cirros0.3.5</short-id>
+    <_name>CirrOS 0.3.5</_name>
+    <version>0.3.5</version>
+    <_vendor>CirrOS</_vendor>
+    <family>linux</family>
+    <distro>cirros</distro>
+    <upgrades id="http://cirros-cloud.net/cirros/0.3.4"/>
+    <derives-from id="http://cirros-cloud.net/cirros/0.3.4"/>
+
+    <release-date>2017-02-14</release-date>
+    <eol-date>2017-11-20</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>52428800</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
--- a/data/os/cirros-cloud.net/cirros-0.4.0.xml.in
+++ b/data/os/cirros-cloud.net/cirros-0.4.0.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://cirros-cloud.net/cirros/0.4.0">
+    <short-id>cirros0.4.0</short-id>
+    <_name>CirrOS 0.4.0</_name>
+    <version>0.4.0</version>
+    <_vendor>CirrOS</_vendor>
+    <family>linux</family>
+    <distro>cirros</distro>
+    <upgrades id="http://cirros-cloud.net/cirros/0.3.5"/>
+    <derives-from id="http://cirros-cloud.net/cirros/0.3.5"/>
+
+    <release-date>2017-11-20</release-date>
+
+    <devices>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
+    </devices>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>134217728</ram>
+        <storage>52428800</storage>
+      </minimum>
+    </resources>
+  </os>
+</libosinfo>
--- a/data/os/debian.org/debian-5.xml.in
+++ b/data/os/debian.org/debian-5.xml.in
@@ -16,8 +16,8 @@
    <eol-date>2012-02-06</eol-date>

    <devices>
-      <device id="http://pcisig.com/pci/1af4/1000"/>
-      <device id="http://pcisig.com/pci/1af4/1001"/>
+      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
+      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
    </devices>

    <resources arch="all">

--- a/data/os/debian.org/debian-6.xml.in
+++ b/data/os/debian.org/debian-6.xml.in
@@ -16,7 +16,7 @@
    <eol-date>2016-02-29</eol-date>

    <devices>
-      <device id="http://usb.org/usb/80ee/0021"/>
+      <device id="http://usb.org/usb/80ee/0021"/> <!-- tablet -->
    </devices>

    <resources arch="all">

--- a/data/os/debian.org/debian-7.xml.in
+++ b/data/os/debian.org/debian-7.xml.in
@@ -16,12 +16,12 @@
    <eol-date>2018-05-31</eol-date>

    <devices>
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- ac97 -->
      <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
      <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
      <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
      <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- qxl -->
    </devices>

    <resources arch="all">

--- a/data/os/debian.org/debian-9.xml.in
+++ b/data/os/debian.org/debian-9.xml.in
@@ -15,14 +15,14 @@
    <release-date>2017-06-17</release-date>

    <devices>
-      <device id="http://pcisig.com/pci/1af4/1041"/>
-      <device id="http://pcisig.com/pci/1af4/1042"/>
-      <device id="http://pcisig.com/pci/1af4/1043"/>
-      <device id="http://pcisig.com/pci/1af4/1044"/>
-      <device id="http://pcisig.com/pci/1af4/1045"/>
-      <device id="http://pcisig.com/pci/1af4/1048"/>
-      <device id="http://pcisig.com/pci/1af4/1049"/>
-      <device id="http://pcisig.com/pci/1af4/1052"/>
+      <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
+      <device id="http://pcisig.com/pci/1af4/1042"/> <!-- virtio1.0-block -->
+      <device id="http://pcisig.com/pci/1af4/1043"/> <!-- virtio1.0-console -->
+      <device id="http://pcisig.com/pci/1af4/1044"/> <!-- virtio1.0-rng -->
+      <device id="http://pcisig.com/pci/1af4/1045"/> <!-- virtio1.0-balloon -->
+      <device id="http://pcisig.com/pci/1af4/1048"/> <!-- virtio1.0-scsi -->
+      <device id="http://pcisig.com/pci/1af4/1049"/> <!-- virtio1.0-9p -->
+      <device id="http://pcisig.com/pci/1af4/1052"/> <!-- virtio1.0-input -->
    </devices>

    <resources arch="all">

--- a/data/os/dragonflybsd.org/dragonflybsd-1.0.xml.in
+++ b/data/os/dragonflybsd.org/dragonflybsd-1.0.xml.in
+<libosinfo version="0.0.1">
+<!-- Licensed under the GNU General Public License version 2 or later.
+     See http://www.gnu.org/licenses/ for a copy of the license text -->
+  <os id="http://dragonflybsd.org/dragonflybsd/1.0">
+    <short-id>dragonflybsd1.0</short-id>
+    <_name>DragonFlyBSD 1.0</_name>
+    <version>1.0</version>
+    <family>dragonflybsd</family>
+    <distro>dragonflybsd</distro>
+    <_vendor>DragonFlyBSD Project</_vendor>
+
+    <release-date>2004-07-12</release-date>
+  </os>
+</libosinfo>