From 3423ff97d2731d9e6254a62d45bd57cea65485fb8f9790316a47437dbc014871 Mon Sep 17 00:00:00 2001
From: Guilherme Moro <gmoro@suse.com>
Date: Fri, 13 Mar 2020 11:01:59 +0000
Subject: [PATCH] Accepting request 784558 from
 home:favogt:branches:Virtualization:Appliances:Images:openSUSE-Tumbleweed

kvm-and-xen image tested, boots fine and baseproduct link is correct.

- Drop XEN flavor, identical to kvm-and-xen meanwhile (boo#1166474)
- Remove obsolete and redundant parts from config.sh
- Remove indefinitely commented out sections in JeOS.kiwi
- Remove invalid vga="normal"
- Add condition to make config.sh suitable for both openSUSE and SLE

OBS-URL: https://build.opensuse.org/request/show/784558
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=24
---
 JeOS.kiwi                   | 94 +++----------------------------------
 _multibuild                 |  1 -
 config.sh                   | 59 +++++------------------
 kiwi-templates-JeOS.changes |  9 ++++
 4 files changed, 26 insertions(+), 137 deletions(-)

diff --git a/JeOS.kiwi b/JeOS.kiwi
index f627bf6..a35c93d 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -10,7 +10,6 @@
     </description>
     <profiles>
         <profile name="kvm-and-xen" description="JeOS for KVM and HVM Xen" arch="x86_64"/>
-        <profile name="XEN" description="JeOS for PV Xen" arch="x86_64"/>
         <profile name="VMware" description="JeOS for VMware" arch="x86_64"/>
         <profile name="MS-HyperV" description="JeOS for Hyper-V" arch="x86_64"/>
         <profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud" arch="x86_64"/>
@@ -21,12 +20,6 @@
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
-    <!-- those settings are applied by suseConfig in config.sh
-        <locale>en_US</locale>
-        <keytable>us.map.gz</keytable>
-        <timezone>Europe/Berlin</timezone>
-        <hwclock>utc</hwclock>
-    -->
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
             image="vmx"
@@ -57,64 +50,11 @@
         </type>
     </preferences>
 
-    <preferences profiles="XEN">
-        <version>15.1.0</version>
-        <packagemanager>zypper</packagemanager>
-        <bootsplash-theme>openSUSE</bootsplash-theme>
-        <bootloader-theme>openSUSE</bootloader-theme>
-    <!-- those settings are applied by suseConfig in config.sh
-        <locale>en_US</locale>
-        <keytable>us.map.gz</keytable>
-        <timezone>Europe/Berlin</timezone>
-        <hwclock>utc</hwclock>
-    -->
-        <rpm-excludedocs>true</rpm-excludedocs>
-        <type
-            image="vmx"
-            filesystem="btrfs"
-            bootprofile="xen"
-            firmware="uefi"
-            efipartsize="33"
-            format="qcow2"
-            bootloader="grub2"
-            kernelcmdline="quiet plymouth.enable=0 console=tty0"
-            bootpartition="false"
-            bootkernel="custom"
-            devicepersistency="by-uuid"
-            btrfs_quota_groups="true"
-            btrfs_root_is_snapshot="true"
-        >
-            <systemdisk>
-                <volume name="home"/>
-                <volume name="root"/>
-                <volume name="tmp"/>
-                <volume name="opt"/>
-                <volume name="srv"/>
-                <volume name="boot/grub2/i386-pc"/>
-                <volume name="boot/grub2/x86_64-efi" mountpoint="boot/grub2/x86_64-efi"/>
-                <volume name="usr/local"/>
-                <volume name="var" copy_on_write="false"/>
-            </systemdisk>
-            <size unit="G">24</size>
-            <machine domain="domU">
-                <!-- creation of hvmloader Xen config file is not supported -->
-                <!-- thus just provide mandatory setup indicating there is a disk -->
-                <vmdisk id="0"/>
-            </machine>
-        </type>
-    </preferences>
-
     <preferences profiles="VMware">
         <version>15.1.0</version>
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
-    <!-- those settings are applied by suseConfig in config.sh
-        <locale>en_US</locale>
-        <keytable>us.map.gz</keytable>
-        <timezone>Europe/Berlin</timezone>
-        <hwclock>utc</hwclock>
-    -->
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
             image="vmx"
@@ -151,18 +91,11 @@
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
-    <!-- those settings are applied by suseConfig in config.sh
-        <locale>en_US</locale>
-        <keytable>us.map.gz</keytable>
-        <timezone>Europe/Berlin</timezone>
-        <hwclock>utc</hwclock>
-    -->
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
             image="vmx"
             filesystem="xfs"
             format="qcow2"
-            vga="normal"
             boottimeout="1"
             bootloader="grub2"
             firmware="uefi"
@@ -179,12 +112,6 @@
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
-    <!-- those settings are applied by suseConfig in config.sh
-        <locale>en_US</locale>
-        <keytable>us.map.gz</keytable>
-        <timezone>Europe/Berlin</timezone>
-        <hwclock>utc</hwclock>
-    -->
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
             image="vmx"
@@ -221,12 +148,6 @@
         <packagemanager>zypper</packagemanager>
         <bootsplash-theme>openSUSE</bootsplash-theme>
         <bootloader-theme>openSUSE</bootloader-theme>
-    <!-- those settings are applied by suseConfig in config.sh
-        <locale>en_US</locale>
-        <keytable>us.map.gz</keytable>
-        <timezone>Europe/Berlin</timezone>
-        <hwclock>utc</hwclock>
-    -->
         <rpm-excludedocs>true</rpm-excludedocs>
         <type
             image="oem"
@@ -300,7 +221,7 @@
     </packages>
 
     <!-- Not needed in OpenStack as it uses XFS and cloud-init -->
-    <packages type="image" profiles="kvm-and-xen,XEN,VMware,MS-HyperV,RaspberryPi">
+    <packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,RaspberryPi">
         <!-- Only for btrfs -->
         <package name="btrfsprogs"/>
         <package name="btrfsmaintenance"/>
@@ -316,10 +237,8 @@
         <package name="firewalld"/>
     </packages>
 
-    <packages type="image" profiles="kvm-and-xen,XEN">
-        <!-- XEN specific packages -->
+    <packages type="image" profiles="kvm-and-xen">
         <package name="xen-tools-domU" arch="x86_64"/>
-        <package name="grub2-x86_64-xen" arch="x86_64"/>
         <package name="xen-libs" arch="x86_64"/>
         <package name="kernel-default-base"/>
     </packages>
@@ -328,15 +247,14 @@
         <package name="kernel-default-base"/>
     </packages>
     <packages type="image" profiles="OpenStack-Cloud">
-        <package name="cloud-init" />
+        <package name="cloud-init"/>
         <package name="cloud-init-config-suse" />
-        <package name="xfsprogs" />
+        <package name="xfsprogs"/>
         <package name="kernel-default-base"/>
     </packages>
     <packages type="image" profiles="MS-HyperV">
-        <package name="hyper-v" arch="x86_64"/>
+        <package name="hyper-v"/>
         <package name="kernel-default-base"/>
-        <!--<package name="python-azure-agent"/> disabled until bsc#1061584 is fixed -->
     </packages>
     <packages type="image" profiles="RaspberryPi">
         <package name="raspberrypi-firmware" arch="aarch64"/>
@@ -352,7 +270,7 @@
     </packages>
 
 <!-- TW does not have those release packages
-    <packages type="image" profiles="kvm-and-xen,XEN">
+    <packages type="image" profiles="kvm-and-xen">
         <package name="openSUSE-release-appliance-kvm"/>
     </packages>
     <packages type="image" profiles="OpenStack-Cloud">
diff --git a/_multibuild b/_multibuild
index e8f56d8..19a8dff 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,6 +1,5 @@
 <multibuild>
   <flavor>kvm-and-xen</flavor>
-  <flavor>XEN</flavor>
   <flavor>VMware</flavor>
   <flavor>MS-HyperV</flavor>
   <flavor>OpenStack-Cloud</flavor>
diff --git a/config.sh b/config.sh
index ecb783d..eac320c 100644
--- a/config.sh
+++ b/config.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2015 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -27,8 +27,6 @@ test -f /.profile && . /.profile
 
 set -euxo pipefail
 
-mkdir /var/lib/misc/reconfig_system
-
 #======================================
 # Greeting...
 #--------------------------------------
@@ -37,7 +35,8 @@ echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..."
 #======================================
 # add missing fonts
 #--------------------------------------
-CONSOLE_FONT="eurlatgr.psfu"
+# Systemd controls the console font now
+echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf
 
 #======================================
 # prepare for setting root pw, timezone
@@ -50,26 +49,12 @@ rm -f /etc/machine-id \
       /var/lib/dbus/machine-id
 
 #======================================
-# SuSEconfig
+# Specify default systemd target
 #--------------------------------------
-echo "** Running suseConfig..."
-suseConfig
-
-echo "** Running ldconfig..."
-/sbin/ldconfig
+baseSetRunlevel multi-user.target
 
 #======================================
-# Setup baseproduct link
-#--------------------------------------
-suseSetupProduct
-
-#======================================
-# Specify default runlevel
-#--------------------------------------
-baseSetRunlevel 3
-
-#======================================
-# Add missing gpg keys to rpm
+# Import trusted rpm keys
 #--------------------------------------
 suseImportBuildKey
 
@@ -104,35 +89,13 @@ fi
 sed -Ei"" "s/#?GRUB_TERMINAL=.+$/GRUB_TERMINAL=gfxterm/g" /etc/default/grub
 sed -Ei"" "s/#?GRUB_GFXMODE=.+$/GRUB_GFXMODE=auto/g" /etc/default/grub
 
-# Systemd controls the console font now
-echo FONT="$CONSOLE_FONT" >> /etc/vconsole.conf
-
-#======================================
-# SSL Certificates Configuration
-#--------------------------------------
-echo '** Rehashing SSL Certificates...'
-update-ca-certificates
-
-if [ ! -s /var/log/zypper.log ]; then
-	> /var/log/zypper.log
-fi
-
-#======================================
-# Import trusted rpm keys
-#--------------------------------------
-for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
-    # importing can fail if it already exists
-    rpm --import $i || true
-done
-
 #======================================
 # Add repos from control.xml
 #--------------------------------------
-add-yast-repos
-zypper --non-interactive rm -u live-add-yast-repos
-
-# only for debugging
-#systemctl enable debug-shell.service
+if grep -q opensuse /usr/lib/os-release; then
+	add-yast-repos
+	zypper --non-interactive rm -u live-add-yast-repos
+fi
 
 #=====================================
 # Configure snapper
@@ -140,7 +103,7 @@ zypper --non-interactive rm -u live-add-yast-repos
 if [ "${kiwi_btrfs_root_is_snapshot-false}" = 'true' ]; then
         echo "creating initial snapper config ..."
         # we can't call snapper here as the .snapshots subvolume
-        # already exists and snapper create-config doens't like
+        # already exists and snapper create-config doesn't like
         # that.
         cp /etc/snapper/config-templates/default /etc/snapper/configs/root
         # Change configuration to match SLES12-SP1 values
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 8cd3e3e..967d7d1 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Mar 12 14:14:03 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Drop XEN flavor, identical to kvm-and-xen meanwhile (boo#1166474)
+- Remove obsolete and redundant parts from config.sh
+- Remove indefinitely commented out sections in JeOS.kiwi
+- Remove invalid vga="normal"
+- Add condition to make config.sh suitable for both openSUSE and SLE
+
 -------------------------------------------------------------------
 Wed Mar  4 14:09:17 UTC 2020 - Fabian Vogt <fvogt@suse.com>