Hello community,
here is the log from the commit of package openSUSE-Tumbleweed-JeOS for
openSUSE:Factory checked in at 2019-04-30 13:06:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-Tumbleweed-JeOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-Tumbleweed-JeOS.new.5536 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-Tumbleweed-JeOS"
Tue Apr 30 13:06:30 2019 rev:13 rq:699435 version:15.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/openSUSE-Tumbleweed-JeOS/kiwi-templates-Tumbleweed-JeOS.changes
2019-04-25 16:21:02.222070266 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-Tumbleweed-JeOS.new.5536/kiwi-templates-Tumbleweed-JeOS.changes
2019-04-30 13:06:33.957559627 +0200
@@ -1,0 +2,6 @@
+Mon Apr 29 13:10:06 UTC 2019 - Fabian Vogt <fv...@suse.com>
+
+- Merge images.sh into config.sh, make it more generic
+- Run config.sh with -euxo pipefail, make it compatible
+
+-------------------------------------------------------------------
Old:
----
images.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.Hp1FVe/_old 2019-04-30 13:06:34.557559227 +0200
+++ /var/tmp/diff_new_pack.Hp1FVe/_new 2019-04-30 13:06:34.557559227 +0200
@@ -25,6 +25,8 @@
test -f /.kconfig && . /.kconfig
test -f /.profile && . /.profile
+set -euxo pipefail
+
mkdir /var/lib/misc/reconfig_system
#======================================
@@ -76,19 +78,28 @@
#--------------------------------------
chkconfig sshd on
-#======================================
-# Sysconfig Update
-#--------------------------------------
-echo '** Update sysconfig entries...'
-# baseUpdateSysConfig /etc/sysconfig/snapper SNAPPER_CONFIGS root
-if [ "${kiwi_profiles}" != "OpenStack-Cloud" ]; then
- baseUpdateSysConfig /etc/sysconfig/network/dhcp DHCLIENT_SET_HOSTNAME
yes
-
+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
+else
# Enable jeos-firstboot
mkdir -p /var/lib/YaST2
touch /var/lib/YaST2/reconfig_system
- # Enable firewalld
+ systemctl mask systemd-firstboot.service
+ systemctl enable jeos-firstboot.service
+
+ # cloud-init-config-suse does that itself
+ baseUpdateSysConfig /etc/sysconfig/network/dhcp DHCLIENT_SET_HOSTNAME
yes
+fi
+
+# Enable firewalld if installed
+if [ -x /usr/sbin/firewalld ]; then
chkconfig firewalld on
fi
@@ -129,7 +140,7 @@
#=====================================
# Configure snapper
#-------------------------------------
-if [ "$kiwi_btrfs_root_is_snapshot" = 'true' ]; then
+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
@@ -181,7 +192,7 @@
EOF
fi
-##
-baseCleanMount
+# Not compatible with set -e
+baseCleanMount || true
exit 0
