Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kiwi-templates-Minimal for
openSUSE:Factory checked in at 2022-10-18 12:44:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-Minimal (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-Minimal"
Tue Oct 18 12:44:21 2022 rev:3 rq:1012011 version:84.87.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-templates-Minimal/kiwi-templates-Minimal.changes
2022-04-20 16:57:52.330653434 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.2275/kiwi-templates-Minimal.changes
2022-10-18 12:44:31.441658732 +0200
@@ -1,0 +2,8 @@
+Thu Aug 25 13:59:00 UTC 2022 - Guilherme Moro <[email protected]>
+
+- Add cloud-init to VMware image (jsc#SLE-7254)
+- Change VMware to use lsilogic SCSI controller
+- Disable firewalld on VMware image
+- Do not enable jeos-firstboot on OpenStack-Cloud
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Minimal.kiwi ++++++
--- /var/tmp/diff_new_pack.q7fZGF/_old 2022-10-18 12:44:31.937659861 +0200
+++ /var/tmp/diff_new_pack.q7fZGF/_new 2022-10-18 12:44:31.945659879 +0200
@@ -113,7 +113,9 @@
<volume name="var" copy_on_write="false"/>
</systemdisk>
<size unit="G">24</size>
- <machine memory="1024" HWversion="10" guestOS="sles-64"/>
+ <machine memory="1024" HWversion="10" guestOS="sles-64">
+ <vmdisk id="0" controller="lsilogic"/>
+ </machine>
</type>
</preferences>
@@ -298,18 +300,20 @@
<package name="snapper-zypp-plugin"/> <!-- this is key snapper/zypp
integration, as requested in the PRD -->
<package name="snapper"/>
- <!-- Only if not cloud-init -->
<!-- Require 1.2.0.0 for proper NM support.
Not sure whether this syntax is intentionally supported but it
appears to work. -->
<package name="jeos-firstboot >= 1.2.0.0"/>
<package name="fbiterm"/> <!-- Optionally used by jeos-firstboot for
non-latin fonts -->
- <!-- NM everywhere except that cloud-init needs wicked -->
- <package name="NetworkManager"/>
<!-- Not useful with OpenStack -->
<package name="firewalld"/>
</packages>
+ <packages type="image" profiles="kvm-and-xen,MS-HyperV,RaspberryPi">
+ <!-- NM everywhere except that cloud-init needs wicked -->
+ <package name="NetworkManager"/>
+ </packages>
+
<packages type="image"
profiles="kvm-and-xen,VMware,MS-HyperV,OpenStack-Cloud">
<!-- Shim for secure boot everywhere except for RPi -->
<package name="shim" arch="aarch64,x86_64"/>
@@ -324,6 +328,8 @@
<package name="qemu-guest-agent"/>
</packages>
<packages type="image" profiles="VMware">
+ <package name="cloud-init"/>
+ <package name="cloud-init-config-suse"/>
<package name="open-vm-tools" arch="x86_64"/>
<package name="kernel-default-base"/>
</packages>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.q7fZGF/_old 2022-10-18 12:44:32.017660043 +0200
+++ /var/tmp/diff_new_pack.q7fZGF/_new 2022-10-18 12:44:32.017660043 +0200
@@ -69,17 +69,19 @@
systemctl enable cloud-init
systemctl enable cloud-config
systemctl enable cloud-final
-else
- # Enable jeos-firstboot
- mkdir -p /var/lib/YaST2
- touch /var/lib/YaST2/reconfig_system
+fi
+
+if [ "$kiwi_profiles" != "OpenStack-Cloud" ]; then
+ # Enable jeos-firstboot
+ mkdir -p /var/lib/YaST2
+ touch /var/lib/YaST2/reconfig_system
- systemctl mask systemd-firstboot.service
- systemctl enable jeos-firstboot.service
+ systemctl mask systemd-firstboot.service
+ systemctl enable jeos-firstboot.service
fi
# Enable firewalld if installed
-if [ -x /usr/sbin/firewalld ]; then
+if [ -x /usr/sbin/firewalld ] && [ "$kiwi_profiles" != "VMware" ]; then
systemctl enable firewalld.service
fi
