Accepting request 831437 from Virtualization:Appliances:Images:openSUSE-Tumbleweed

- Drop call of baseCleanMount, not necessary
- Replace suseInsertService with direct systemctl enable

OBS-URL: https://build.opensuse.org/request/show/831437
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kiwi-templates-JeOS?expand=0&rev=18

config.sh

@@ -67,10 +67,10 @@ if [ -e /etc/cloud/cloud.cfg ]; then
         # not useful for cloud
         systemctl mask systemd-firstboot.service
 
-        suseInsertService cloud-init-local
-        suseInsertService cloud-init
-        suseInsertService cloud-config
-        suseInsertService cloud-final
+        systemctl enable cloud-init-local
+        systemctl enable cloud-init
+        systemctl enable cloud-config
+        systemctl enable cloud-final
 else
         # Enable jeos-firstboot
         mkdir -p /var/lib/YaST2
@@ -113,7 +113,7 @@ fi
 # Enable chrony if installed
 #-------------------------------------
 if [ -f /etc/chrony.conf ]; then
-	suseInsertService chronyd
+	systemctl enable chronyd
 fi
 
 #======================================
@@ -125,8 +125,3 @@ sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g' /etc/zypp/zypp.c
 # Disable installing documentation
 #--------------------------------------
 sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' /etc/zypp/zypp.conf
-
-# Not compatible with set -e
-baseCleanMount || true
-
-exit 0

kiwi-templates-JeOS.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  2 10:00:36 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Drop call of baseCleanMount, not necessary
+- Replace suseInsertService with direct systemctl enable
+
 -------------------------------------------------------------------
 Fri Aug 28 07:27:05 UTC 2020 - Fabian Vogt <fvogt@suse.com>