From christian.ehrhardt at canonical.com  Tue Feb 11 15:55:46 2020
From: christian.ehrhardt at canonical.com (Christian Ehrhardt)
Date: Tue, 11 Feb 2020 16:55:46 +0100
Subject: [PATCH 0/4] Add Ubuntu 20.04
Message-ID: <20200211155550.19411-1-christian.ehrhardt@canonical.com>

Hi,
for some recent releases the new ubuntu version was added after the version
was released. Which made it odd for users to not find the version they are on.
This time lets add 20.04 ahead of time.

Since there isn't a released versions yet the links will have to go to the
daily builds. Those are and will continue to be correct and more up-to-date
than the release images. But obviously e.g. Volume-size will change.

I have added the expected final URLs in the XML so that you should have an
easy switch after the release in case you want to switch to the release URLs.

While I was working on that I found some more fixups that could be applied.

Christian Ehrhardt (4):
  debian10: Update links to 10.3 release
  ubuntu-19.04: Update dead links
  ubuntu 19.10: fix arch in volume-id
  ubuntu: Add 20.04 entry

 data/os/debian.org/debian-10.xml.in           |  24 +--
 data/os/ubuntu.com/ubuntu-19.04.xml.in        |  10 +-
 data/os/ubuntu.com/ubuntu-19.10.xml.in        |   4 +-
 data/os/ubuntu.com/ubuntu-20.04.xml.in        | 160 ++++++++++++++++++
 .../ubuntu-20.04-desktop-amd64.iso.txt        |  29 ++++
 .../ubuntu-20.04-live-server-amd64.iso.txt    |  29 ++++
 .../ubuntu-20.04-live-server-arm64.iso.txt    |  29 ++++
 .../ubuntu-20.04-live-server-ppc64el.iso.txt  |  17 ++
 .../ubuntu-20.04-live-server-s390x.iso.txt    |  29 ++++
 .../ubuntu-20.04-server-amd64.iso.txt         |  29 ++++
 .../ubuntu-20.04-server-arm64.iso.txt         |  29 ++++
 .../ubuntu-20.04-server-ppc64el.iso.txt       |  17 ++
 .../ubuntu-20.04-server-s390x.iso.txt         |  29 ++++
 13 files changed, 416 insertions(+), 19 deletions(-)
 create mode 100644 data/os/ubuntu.com/ubuntu-20.04.xml.in
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt

-- 
2.25.0




From christian.ehrhardt at canonical.com  Tue Feb 11 15:55:49 2020
From: christian.ehrhardt at canonical.com (Christian Ehrhardt)
Date: Tue, 11 Feb 2020 16:55:49 +0100
Subject: [PATCH 3/4] ubuntu 19.10: fix arch in volume-id
In-Reply-To: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
References: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
Message-ID: <20200211155550.19411-4-christian.ehrhardt@canonical.com>

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
 data/os/ubuntu.com/ubuntu-19.10.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-19.10.xml.in b/data/os/ubuntu.com/ubuntu-19.10.xml.in
index fada2a60..f6ed822f 100644
--- a/data/os/ubuntu.com/ubuntu-19.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-19.10.xml.in
@@ -94,7 +94,7 @@
     <media arch="ppc64le" live="true" installer-script="false">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/19.10/release/ubuntu-19.10-live-server-ppc64el.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 19.10 arm64</volume-id>
+        <volume-id>Ubuntu-Server 19.10 ppc64</volume-id>
         <volume-size>904808448</volume-size>
       </iso>
       <kernel>casper/vmlinuz</kernel>
@@ -111,7 +111,7 @@
     <media arch="s390x" live="true" installer-script="false">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/19.10/release/ubuntu-19.10-live-server-s390x.iso</url>
       <iso>
-        <volume-id>Ubuntu-Server 19.10 arm64</volume-id>
+        <volume-id>Ubuntu-Server 19.10 s390x</volume-id>
         <volume-size>734289920</volume-size>
       </iso>
       <kernel>casper/vmlinuz</kernel>
-- 
2.25.0




From christian.ehrhardt at canonical.com  Tue Feb 11 15:55:50 2020
From: christian.ehrhardt at canonical.com (Christian Ehrhardt)
Date: Tue, 11 Feb 2020 16:55:50 +0100
Subject: [PATCH 4/4] ubuntu: Add 20.04 entry
In-Reply-To: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
References: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
Message-ID: <20200211155550.19411-5-christian.ehrhardt@canonical.com>

Changes since 19.10
- updated Dates
- Updated URLs - since we are pre-release using daily builds
- drop i386 that is no more supported
- use LTS IDs as in the 18.04 data

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
 data/os/ubuntu.com/ubuntu-20.04.xml.in        | 160 ++++++++++++++++++
 .../ubuntu-20.04-desktop-amd64.iso.txt        |  29 ++++
 .../ubuntu-20.04-live-server-amd64.iso.txt    |  29 ++++
 .../ubuntu-20.04-live-server-arm64.iso.txt    |  29 ++++
 .../ubuntu-20.04-live-server-ppc64el.iso.txt  |  17 ++
 .../ubuntu-20.04-live-server-s390x.iso.txt    |  29 ++++
 .../ubuntu-20.04-server-amd64.iso.txt         |  29 ++++
 .../ubuntu-20.04-server-arm64.iso.txt         |  29 ++++
 .../ubuntu-20.04-server-ppc64el.iso.txt       |  17 ++
 .../ubuntu-20.04-server-s390x.iso.txt         |  29 ++++
 10 files changed, 397 insertions(+)
 create mode 100644 data/os/ubuntu.com/ubuntu-20.04.xml.in
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt
 create mode 100644 tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt

diff --git a/data/os/ubuntu.com/ubuntu-20.04.xml.in b/data/os/ubuntu.com/ubuntu-20.04.xml.in
new file mode 100644
index 00000000..2684dcad
--- /dev/null
+++ b/data/os/ubuntu.com/ubuntu-20.04.xml.in
@@ -0,0 +1,160 @@
+<?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://ubuntu.com/ubuntu/20.04">
+    <short-id>ubuntu20.04</short-id>
+    <short-id>ubuntufocal</short-id>
+    <_name>Ubuntu 20.04</_name>
+    <version>20.04</version>
+    <_vendor>Canonical Ltd</_vendor>
+    <family>linux</family>
+    <distro>ubuntu</distro>
+    <codename>Focal Fossa</codename>
+    <upgrades id="http://ubuntu.com/ubuntu/19.10"/>
+    <derives-from id="http://ubuntu.com/ubuntu/19.10"/>
+
+    <release-date>2020-04-23</release-date>
+    <eol-date>2030-04-23</eol-date>
+
+    <resources arch="all">
+      <minimum>
+        <cpu>1000000000</cpu>
+        <n-cpus>1</n-cpus>
+        <ram>2147483648</ram>
+        <storage>5368709120</storage>
+      </minimum>
+      <recommended>
+        <cpu>2000000000</cpu>
+        <ram>4294967296</ram>
+        <storage>26843545600</storage>
+      </recommended>
+    </resources>
+
+    <media arch="x86_64">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS amd64</volume-id>
+      </iso>
+      <kernel>install/vmlinuz</kernel>
+      <initrd>install/initrd.gz</initrd>
+      <installer>
+        <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+        <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+      </installer>
+    </media>
+    <media arch="x86_64" live="true" installer-script="false">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-amd64.iso</url>
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd</initrd>
+    </media>
+    <!-- Although desktop media should support unattended installation,
+         it seems to be broken using the very same preseed file used
+         with the server media (for a "desktop" installation).
+         People from Canonical were already contacted about this and
+         once it's solved, we can remove the installer-script="false"
+         attribute and add support for the "desktop" installer script
+         for this media. -->
+    <media arch="x86_64" live="true" installer-script="false">
+        <url>http://cdimage.ubuntu.com/daily-live/current/focal-desktop-amd64.iso</url>
+        <!-- after release date the release-build will be at <url>http://releases.ubuntu.com/20.04/ubuntu-20.04-desktop-amd64.iso</url> -->
+      <iso>
+        <volume-id>Ubuntu 20.04(.\d\+?)? LTS amd64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd</initrd>
+    </media>
+    <media arch="aarch64">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-arm64.iso</url>
+      <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-server-arm64.iso</url> -->
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS arm64</volume-id>
+      </iso>
+      <kernel>install/vmlinuz</kernel>
+      <initrd>install/initrd.gz</initrd>
+    </media>
+    <media arch="aarch64" live="true" installer-script="false">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-arm64.iso</url>
+      <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-live-server-arm64.iso</url> -->
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS arm64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd</initrd>
+    </media>
+    <media arch="ppc64le">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-ppc64el.iso</url>
+      <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-server-ppc64el.iso</url> -->
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS ppc64</volume-id>
+      </iso>
+       <kernel>install/vmlinux</kernel>
+       <initrd>install/initrd.gz</initrd>
+    </media>
+    <media arch="ppc64le" live="true" installer-script="false">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-ppc64el.iso</url>
+      <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-live-server-ppc64el.iso</url> -->
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS ppc64</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd</initrd>
+    </media>
+    <media arch="s390x">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily/current/focal-server-s390x.iso</url>
+      <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-server-s390x.iso</url> -->
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS s390x</volume-id>
+      </iso>
+      <kernel>boot/kernel.ubuntu</kernel>
+      <initrd>boot/initrd.ubuntu</initrd>
+    </media>
+    <media arch="s390x" live="true" installer-script="false">
+      <url>http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/focal-live-server-s390x.iso</url>
+      <!-- after release date the release-build will be at <url>http://cdimage.ubuntu.com/ubuntu/releases/20.04/release/ubuntu-20.04-live-server-s390x.iso</url> -->
+      <iso>
+        <volume-id>Ubuntu-Server 20.04(.\d\+?)? LTS s390x</volume-id>
+      </iso>
+      <kernel>casper/vmlinuz</kernel>
+      <initrd>casper/initrd</initrd>
+    </media>
+
+    <tree arch="x86_64">
+      <url>http://archive.ubuntu.com/ubuntu/dists/focal/main/installer-amd64</url>
+      <kernel>current/images/netboot/ubuntu-installer/amd64/linux</kernel>
+      <initrd>current/images/netboot/ubuntu-installer/amd64/initrd.gz</initrd>
+    </tree>
+
+    <image arch="x86_64" format="qcow2" cloud-init="true">
+      <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img</url>
+    </image>
+
+    <image arch="x86_64" format="vmdk" cloud-init="true">
+      <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.vmdk</url>
+    </image>
+
+    <image arch="aarch64" format="qcow2" cloud-init="true">
+      <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-arm64.img</url>
+    </image>
+
+    <image arch="armv7l" format="qcow2" cloud-init="true">
+      <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-armhf.img</url>
+    </image>
+
+    <image arch="ppc64le" format="qcow2" cloud-init="true">
+      <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-ppc64el.img</url>
+    </image>
+
+    <image arch="s390x" format="qcow2" cloud-init="true">
+      <url>https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-s390x.img</url>
+    </image>
+
+    <installer>
+      <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+      <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+    </installer>
+  </os>
+</libosinfo>
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt
new file mode 100644
index 00000000..bd04ea2f
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-desktop-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu 20.04 LTS amd64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 1240320
+El Torito VD version 1 found, boot catalog is in sector 269
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff F7E76 1015414
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt
new file mode 100644
index 00000000..5784e278
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS amd64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 445952
+El Torito VD version 1 found, boot catalog is in sector 217
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 53C64 343140
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt
new file mode 100644
index 00000000..89f51378
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-arm64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS arm64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 414702
+El Torito VD version 1 found, boot catalog is in sector 362
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 239 (Unknown Arch)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 400
+        Bootoff 505B7 329143
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt
new file mode 100644
index 00000000..cc4433b9
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-ppc64el.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS ppc64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 450558
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt
new file mode 100644
index 00000000..5c3226de
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-live-server-s390x.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS s390x
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 365721
+El Torito VD version 1 found, boot catalog is in sector 126
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 3628
+        Bootoff 7F 127
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt
new file mode 100644
index 00000000..062db03b
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-amd64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS amd64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 406016
+El Torito VD version 1 found, boot catalog is in sector 4274
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 239 (Unknown Arch)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 400
+        Bootoff 1B3F7 111607
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt
new file mode 100644
index 00000000..28941258
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-arm64.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS arm64
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.2.4 2012.07.20.130001, LIBISOBURN-1.2.4, LIBISOFS-1.2.4, LIBBURN-1.2.4
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 429247
+El Torito VD version 1 found, boot catalog is in sector 4274
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 239 (Unknown Arch)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 400
+        Bootoff 1B3F7 111607
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt
new file mode 100644
index 00000000..f940f89b
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-ppc64el.iso.txt
@@ -0,0 +1,17 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS ppc64
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 432834
+CD-ROM uses ISO 9660:1999 relaxed format
+NO Joliet present
+Rock Ridge signatures version 1 found
diff --git a/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt
new file mode 100644
index 00000000..e0aff20a
--- /dev/null
+++ b/tests/isodata/ubuntu/ubuntu20.04/ubuntu-20.04-server-s390x.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Ubuntu-Server 20.04 LTS s390x
+Volume set id: 
+Publisher id: 
+Data preparer id: 
+Application id: GENISOIMAGE ISO 9660/HFS FILESYSTEM CREATOR (C) 1993 E.YOUNGDALE (C) 1997-2006 J.PEARSON/J.SCHILLING (C) 2006-2007 CDRKIT TEAM
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 325677
+El Torito VD version 1 found, boot catalog is in sector 1952
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect FFFFE4E8
+        Bootoff 7A1 1953
-- 
2.25.0




From christian.ehrhardt at canonical.com  Tue Feb 11 15:55:48 2020
From: christian.ehrhardt at canonical.com (Christian Ehrhardt)
Date: Tue, 11 Feb 2020 16:55:48 +0100
Subject: [PATCH 2/4] ubuntu-19.04: Update dead links
In-Reply-To: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
References: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
Message-ID: <20200211155550.19411-3-christian.ehrhardt@canonical.com>

All ISOs have been moved to old-releases.ubuntu.com.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
 data/os/ubuntu.com/ubuntu-19.04.xml.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-19.04.xml.in b/data/os/ubuntu.com/ubuntu-19.04.xml.in
index dc796957..20298755 100644
--- a/data/os/ubuntu.com/ubuntu-19.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-19.04.xml.in
@@ -32,7 +32,7 @@
     </resources>
 
     <media arch="x86_64">
-      <url>http://cdimage.ubuntu.com/ubuntu/releases/19.04/release/ubuntu-19.04-server-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/19.04/ubuntu-19.04-server-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 19.04(.\d\+?)? amd64</volume-id>
       </iso>
@@ -44,7 +44,7 @@
       </installer>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://releases.ubuntu.com/19.04/ubuntu-19.04-desktop-amd64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/19.04/ubuntu-19.04-desktop-amd64.iso</url>
       <iso>
         <volume-id>Ubuntu 19.04(.\d\+?)? amd64</volume-id>
       </iso>
@@ -55,7 +55,7 @@
       </installer>
     </media>
     <media arch="aarch64">
-      <url>http://cdimage.ubuntu.com/ubuntu/releases/19.04/release/ubuntu-19.04-server-arm64.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/19.04/ubuntu-19.04-server-arm64.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 19.04(.\d\+?)? arm64</volume-id>
       </iso>
@@ -63,7 +63,7 @@
       <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="ppc64le">
-      <url>http://cdimage.ubuntu.com/ubuntu/releases/19.04/release/ubuntu-19.04-server-ppc64el.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/19.04/ubuntu-19.04-server-ppc64el.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 19.04(.\d\+?)? ppc64</volume-id>
       </iso>
@@ -71,7 +71,7 @@
        <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="s390x">
-      <url>http://cdimage.ubuntu.com/ubuntu/releases/19.04/release/ubuntu-19.04-server-s390x.iso</url>
+      <url>http://old-releases.ubuntu.com/releases/19.04/ubuntu-19.04-server-s390x.iso</url>
       <iso>
         <volume-id>Ubuntu-Server 19.04(.\d\+?)? s390x</volume-id>
       </iso>
-- 
2.25.0




From christian.ehrhardt at canonical.com  Tue Feb 11 15:55:47 2020
From: christian.ehrhardt at canonical.com (Christian Ehrhardt)
Date: Tue, 11 Feb 2020 16:55:47 +0100
Subject: [PATCH 1/4] debian10: Update links to 10.3 release
In-Reply-To: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
References: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
Message-ID: <20200211155550.19411-2-christian.ehrhardt@canonical.com>

10.3 has been released and links for 10.2 are gone from their servers.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
 data/os/debian.org/debian-10.xml.in | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/os/debian.org/debian-10.xml.in b/data/os/debian.org/debian-10.xml.in
index dbd4433f..891f8403 100644
--- a/data/os/debian.org/debian-10.xml.in
+++ b/data/os/debian.org/debian-10.xml.in
@@ -39,7 +39,7 @@
     <!-- Network installer -->
     <media arch="i686">
       <variant id="universal-netinst"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-10.2.0-i386-netinst.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-10.3.0-i386-netinst.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ i386 n</volume-id>
       </iso>
@@ -48,7 +48,7 @@
     </media>
     <media arch="x86_64">
       <variant id="universal-netinst"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-10.2.0-amd64-netinst.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-10.3.0-amd64-netinst.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ amd64 n</volume-id>
       </iso>
@@ -57,7 +57,7 @@
     </media>
     <media arch="aarch64">
       <variant id="universal-netinst"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-10.2.0-arm64-netinst.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-10.3.0-arm64-netinst.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ arm64 n</volume-id>
       </iso>
@@ -66,7 +66,7 @@
     </media>
     <media arch="armv7l">
       <variant id="universal-netinst"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-10.2.0-armhf-netinst.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-10.3.0-armhf-netinst.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ armhf n</volume-id>
       </iso>
@@ -75,7 +75,7 @@
     </media>
     <media arch="ppc64le">
       <variant id="universal-netinst"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/ppc64el/iso-cd/debian-10.2.0-ppc64el-netinst.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/ppc64el/iso-cd/debian-10.3.0-ppc64el-netinst.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ ppc64el n</volume-id>
       </iso>
@@ -84,7 +84,7 @@
     </media>
     <media arch="s390x">
       <variant id="universal-netinst"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/s390x/iso-cd/debian-10.2.0-s390x-netinst.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/s390x/iso-cd/debian-10.3.0-s390x-netinst.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ s390x n</volume-id>
       </iso>
@@ -95,7 +95,7 @@
     <!-- DVD -->
     <media arch="i686">
       <variant id="universal"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/i386/iso-dvd/debian-10.2.0-i386-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/i386/iso-dvd/debian-10.3.0-i386-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ i386 (\d)+</volume-id>
       </iso>
@@ -104,7 +104,7 @@
     </media>
     <media arch="x86_64">
       <variant id="universal"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/amd64/iso-dvd/debian-10.2.0-amd64-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/amd64/iso-dvd/debian-10.3.0-amd64-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ amd64 (\d)+</volume-id>
       </iso>
@@ -113,7 +113,7 @@
     </media>
     <media arch="aarch64">
       <variant id="universal"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/arm64/iso-dvd/debian-10.2.0-arm64-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/arm64/iso-dvd/debian-10.3.0-arm64-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ arm64 (\d)+</volume-id>
       </iso>
@@ -122,7 +122,7 @@
     </media>
     <media arch="armv7l">
       <variant id="universal"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/armhf/iso-dvd/debian-10.2.0-armhf-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/armhf/iso-dvd/debian-10.3.0-armhf-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ armhf (\d)+</volume-id>
       </iso>
@@ -131,7 +131,7 @@
     </media>
     <media arch="ppc64le">
       <variant id="universal"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/ppc64el/iso-dvd/debian-10.2.0-ppc64el-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/ppc64el/iso-dvd/debian-10.3.0-ppc64el-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ ppc64el (\d)+</volume-id>
       </iso>
@@ -140,7 +140,7 @@
     </media>
     <media arch="s390x">
       <variant id="universal"/>
-      <url>http://cdimage.debian.org/cdimage/release/current/s390x/iso-dvd/debian-10.2.0-s390x-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/cdimage/release/current/s390x/iso-dvd/debian-10.3.0-s390x-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 10.(\d)+.(\d)+ s390x (\d)+</volume-id>
       </iso>
-- 
2.25.0




From fidencio at redhat.com  Tue Feb 11 20:20:11 2020
From: fidencio at redhat.com (=?UTF-8?Q?Fabiano_Fid=C3=AAncio?=)
Date: Tue, 11 Feb 2020 21:20:11 +0100
Subject: [PATCH 0/4] Add Ubuntu 20.04
In-Reply-To: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
References: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
Message-ID: <CAAY6XscZGnTT6WCEofDPNLK+q3XJrb-QOnoC749qpipGPgRQqA@mail.gmail.com>

Christian,

On Tue, Feb 11, 2020 at 4:55 PM Christian Ehrhardt
<christian.ehrhardt at canonical.com> wrote:
>
> Hi,
> for some recent releases the new ubuntu version was added after the version
> was released. Which made it odd for users to not find the version they are on.
> This time lets add 20.04 ahead of time.
>
> Since there isn't a released versions yet the links will have to go to the
> daily builds. Those are and will continue to be correct and more up-to-date
> than the release images. But obviously e.g. Volume-size will change.
>
> I have added the expected final URLs in the XML so that you should have an
> easy switch after the release in case you want to switch to the release URLs.
>
> While I was working on that I found some more fixups that could be applied.
>

Cool, I'll review these patches Tomorrow. Meanwhile, I'd like to
mention that the preferred way to submit patches for libosinfo
projects is opening a Merge Request against
https://gitlab.com/libosinfo/.

Would you mind opening the MR there? If you do mind, I'll review the
patches here in the ML.

Best Regards,
-- 
Fabiano Fid?ncio




From christian.ehrhardt at canonical.com  Wed Feb 12 08:35:07 2020
From: christian.ehrhardt at canonical.com (Christian Ehrhardt)
Date: Wed, 12 Feb 2020 09:35:07 +0100
Subject: [PATCH 0/4] Add Ubuntu 20.04
In-Reply-To: <CAAY6XscZGnTT6WCEofDPNLK+q3XJrb-QOnoC749qpipGPgRQqA@mail.gmail.com>
References: <20200211155550.19411-1-christian.ehrhardt@canonical.com>
	<CAAY6XscZGnTT6WCEofDPNLK+q3XJrb-QOnoC749qpipGPgRQqA@mail.gmail.com>
Message-ID: <CAATJJ0JAq87eaEOdgoTkQ102gBb6OfBi+9AThz8tXqEmvDVZ=A@mail.gmail.com>

On Tue, Feb 11, 2020 at 9:20 PM Fabiano Fid?ncio <fidencio at redhat.com>
wrote:

> Christian,
>
> On Tue, Feb 11, 2020 at 4:55 PM Christian Ehrhardt
> <christian.ehrhardt at canonical.com> wrote:
> >
> > Hi,
> > for some recent releases the new ubuntu version was added after the
> version
> > was released. Which made it odd for users to not find the version they
> are on.
> > This time lets add 20.04 ahead of time.
> >
> > Since there isn't a released versions yet the links will have to go to
> the
> > daily builds. Those are and will continue to be correct and more
> up-to-date
> > than the release images. But obviously e.g. Volume-size will change.
> >
> > I have added the expected final URLs in the XML so that you should have
> an
> > easy switch after the release in case you want to switch to the release
> URLs.
> >
> > While I was working on that I found some more fixups that could be
> applied.
> >
>
> Cool, I'll review these patches Tomorrow. Meanwhile, I'd like to
> mention that the preferred way to submit patches for libosinfo
> projects is opening a Merge Request against
> https://gitlab.com/libosinfo/.
>
> Would you mind opening the MR there? If you do mind, I'll review the
> patches here in the ML.
>

No problem at all, but that will add another patch to the readme :-)
Because I only submitted it here as-is because it said:

"Patch submissions are welcomed from any interested contributor. Please
use the libosinfo list as the preferred way for patch submissions, or
discussions about the code:

    https://www.redhat.com/mailman/listinfo/libosinfo
"

I'm more than happy to use the gitlab MR workflow on this.
=> https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/90

Best Regards,
> --
> Fabiano Fid?ncio
>
>

-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libosinfo/attachments/20200212/44c3fb27/attachment.htm>