[Libosinfo] [osinfo-db PATCH 23/29] ubuntu16.04: Move installer under medias

[Fabiano Fidêncio]

JeOS installations have never been tested as libosinfo never had an app
consuming those scripts.

Knowing that there's no consumers affected, let's move the installers
under the specific medias the installer has been tested against.

The reason why the "desktop" profile has also been moved under the
"server" medias is because we can safely use the "desktop" script with
the "server" medias and have the very same result as when using the
"desktop" medias. Unfortunately, the opposite is not true (performing
a "JeOS" installation in a "desktop" media and having the same result).

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 data/os/ubuntu.com/ubuntu-16.04.xml.in | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in b/data/os/ubuntu.com/ubuntu-16.04.xml.in
index 6da1d35..5d7baef 100644
--- a/data/os/ubuntu.com/ubuntu-16.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -37,6 +37,10 @@
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
+      <installer>
+        <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+        <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+      </installer>
     </media>
     <media arch="x86_64">
       <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-server-amd64.iso</url>
@@ -45,6 +49,10 @@
       </iso>
       <kernel>install/vmlinuz</kernel>
       <initrd>install/initrd.gz</initrd>
+      <installer>
+        <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
+        <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+      </installer>
     </media>
     <media arch="i686" live="true">
       <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-i386.iso</url>
@@ -53,6 +61,9 @@
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd</initrd>
+      <installer>
+        <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+      </installer>
     </media>
     <media arch="x86_64" live="true">
       <url>http://releases.ubuntu.com/16.04/ubuntu-16.04.5-desktop-amd64.iso</url>
@@ -61,6 +72,9 @@
       </iso>
       <kernel>casper/vmlinuz</kernel>
       <initrd>casper/initrd</initrd>
+      <installer>
+        <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
+      </installer>
     </media>
     <media arch="ppc">
       <url>http://cdimage.ubuntu.com/ubuntu/releases/16.04/release/ubuntu-16.04.5-server-powerpc.iso</url>
@@ -84,10 +98,5 @@
       <kernel>boot/kernel.ubuntu</kernel>
       <initrd>boot/initrd.ubuntu</initrd>
     </media>
-
-    <installer>
-      <script id='http://ubuntu.com/ubuntu/preseed/desktop'/>
-      <script id='http://ubuntu.com/ubuntu/preseed/jeos'/>
-    </installer>
   </os>
 </libosinfo>
-- 
2.20.1