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-11-12 17:40:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-Minimal (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-Minimal"
Sat Nov 12 17:40:32 2022 rev:4 rq:1035204 version:84.87.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-templates-Minimal/kiwi-templates-Minimal.changes
2022-10-18 12:44:31.441658732 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.1597/kiwi-templates-Minimal.changes
2022-11-12 17:40:41.950000115 +0100
@@ -1,0 +2,6 @@
+Thu Nov 10 15:52:38 UTC 2022 - Guilherme Moro <[email protected]>
+
+- Rename OpenStack-Cloud to Cloud (jsc#PED-1849)
+- Enable jeos-firstboot on Cloud image
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Minimal.kiwi ++++++
--- /var/tmp/diff_new_pack.56fwFs/_old 2022-11-12 17:40:42.434002997 +0100
+++ /var/tmp/diff_new_pack.56fwFs/_new 2022-11-12 17:40:42.438003020 +0100
@@ -12,7 +12,7 @@
<profile name="kvm-and-xen" description="Minimal Image for KVM and
Xen" arch="aarch64,x86_64"/>
<profile name="VMware" description="Minimal Image for VMware"
arch="x86_64"/>
<profile name="MS-HyperV" description="Minimal Image for Hyper-V"
arch="aarch64,x86_64"/>
- <profile name="OpenStack-Cloud" description="Minimal Image for
OpenStack Cloud" arch="x86_64"/>
+ <profile name="Cloud" description="Minimal Image for Cloud"
arch="x86_64"/>
<profile name="RaspberryPi" description="Minimal Image for the
Raspberry Pi" arch="aarch64"/>
</profiles>
<preferences profiles="kvm-and-xen" arch="x86_64">
@@ -119,7 +119,7 @@
</type>
</preferences>
- <preferences profiles="OpenStack-Cloud">
+ <preferences profiles="Cloud">
<version>1.0.0</version>
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
@@ -291,7 +291,7 @@
<package name="zypper-needs-restarting"/> <!-- Some deployment script
use this (bsc#1173548) -->
</packages>
- <!-- Not needed in OpenStack as it uses XFS and cloud-init -->
+ <!-- Not needed in Cloud as it uses XFS and cloud-init -->
<packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,RaspberryPi">
<!-- Only for btrfs -->
<package name="btrfsprogs"/>
@@ -305,7 +305,7 @@
<package name="jeos-firstboot >= 1.2.0.0"/>
<package name="fbiterm"/> <!-- Optionally used by jeos-firstboot for
non-latin fonts -->
- <!-- Not useful with OpenStack -->
+ <!-- Not useful with Cloud -->
<package name="firewalld"/>
</packages>
@@ -314,7 +314,7 @@
<package name="NetworkManager"/>
</packages>
- <packages type="image"
profiles="kvm-and-xen,VMware,MS-HyperV,OpenStack-Cloud">
+ <packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,Cloud">
<!-- Shim for secure boot everywhere except for RPi -->
<package name="shim" arch="aarch64,x86_64"/>
</packages>
@@ -324,7 +324,7 @@
<package name="xen-libs"/>
<package name="kernel-default-base"/>
</packages>
- <packages type="image" profiles="kvm-and-xen,OpenStack-Cloud">
+ <packages type="image" profiles="kvm-and-xen,Cloud">
<package name="qemu-guest-agent"/>
</packages>
<packages type="image" profiles="VMware">
@@ -333,9 +333,11 @@
<package name="open-vm-tools" arch="x86_64"/>
<package name="kernel-default-base"/>
</packages>
- <packages type="image" profiles="OpenStack-Cloud">
+ <packages type="image" profiles="Cloud">
<package name="cloud-init"/>
<package name="cloud-init-config-suse" />
+ <package name="jeos-firstboot"/>
+ <package name="fbiterm"/>
<package name="xfsprogs"/>
<package name="kernel-default-base"/>
</packages>
@@ -374,7 +376,7 @@
<packages type="bootstrap" profiles="kvm-and-xen">
<package name="openSUSE-release-appliance-kvm"/>
</packages>
- <packages type="bootstrap" profiles="OpenStack-Cloud">
+ <packages type="bootstrap" profiles="Cloud">
<package name="openSUSE-release-appliance-openstack"/>
</packages>
<packages type="bootstrap" profiles="MS-HyperV">
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.56fwFs/_old 2022-11-12 17:40:42.502003401 +0100
+++ /var/tmp/diff_new_pack.56fwFs/_new 2022-11-12 17:40:42.506003425 +0100
@@ -2,7 +2,7 @@
<flavor>kvm-and-xen</flavor>
<flavor>VMware</flavor>
<flavor>MS-HyperV</flavor>
- <flavor>OpenStack-Cloud</flavor>
+ <flavor>Cloud</flavor>
<flavor>RaspberryPi</flavor>
</multibuild>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.56fwFs/_old 2022-11-12 17:40:42.522003520 +0100
+++ /var/tmp/diff_new_pack.56fwFs/_new 2022-11-12 17:40:42.522003520 +0100
@@ -62,25 +62,20 @@
systemctl enable sshd.service
if [ -e /etc/cloud/cloud.cfg ]; then
- # not useful for cloud
- systemctl mask systemd-firstboot.service
-
systemctl enable cloud-init-local
systemctl enable cloud-init
systemctl enable cloud-config
systemctl enable cloud-final
fi
-if [ "$kiwi_profiles" != "OpenStack-Cloud" ]; then
- # Enable jeos-firstboot
- mkdir -p /var/lib/YaST2
- touch /var/lib/YaST2/reconfig_system
+# Enable jeos-firstboot
+mkdir -p /var/lib/YaST2
+touch /var/lib/YaST2/reconfig_system
- systemctl mask systemd-firstboot.service
- systemctl enable jeos-firstboot.service
-fi
+systemctl mask systemd-firstboot.service
+systemctl enable jeos-firstboot.service
-# Enable firewalld if installed
+# Enable firewalld if installed except on VMware
if [ -x /usr/sbin/firewalld ] && [ "$kiwi_profiles" != "VMware" ]; then
systemctl enable firewalld.service
fi
