From bc522c2861bf917e24e6c9b59e60c6234e3748f2ff7f2926de212c36e1e7ec8a Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 2 Sep 2020 10:59:46 +0000 Subject: [PATCH] - Drop call of baseCleanMount, not necessary - Replace suseInsertService with direct systemctl enable OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=43 --- config.sh | 15 +++++---------- kiwi-templates-JeOS.changes | 6 ++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/config.sh b/config.sh index 22b8130..854309c 100644 --- a/config.sh +++ b/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 diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes index 5644d2a..83a9622 100644 --- a/kiwi-templates-JeOS.changes +++ b/kiwi-templates-JeOS.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 2 10:00:36 UTC 2020 - Fabian Vogt + +- Drop call of baseCleanMount, not necessary +- Replace suseInsertService with direct systemctl enable + ------------------------------------------------------------------- Fri Aug 28 07:27:05 UTC 2020 - Fabian Vogt