Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-MicroOS for
openSUSE:Factory checked in at 2021-11-25 23:05:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-MicroOS"
Thu Nov 25 23:05:47 2021 rev:46 rq:933799 version:16.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes
2021-11-20 20:37:36.333834433 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1895/openSUSE-MicroOS.changes
2021-11-25 23:06:10.157190183 +0100
@@ -1,0 +2,7 @@
+Wed Nov 24 12:17:53 UTC 2021 - Fabian Vogt <fv...@suse.com>
+
+- Move kernelcmdline computation into config.sh
+- Drop use of namedCollection completely
+- Switch to SELinux
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-MicroOS.kiwi ++++++
--- /var/tmp/diff_new_pack.IJg7xy/_old 2021-11-25 23:06:10.725188224 +0100
+++ /var/tmp/diff_new_pack.IJg7xy/_new 2021-11-25 23:06:10.725188224 +0100
@@ -155,7 +155,6 @@
filesystem="btrfs"
format="qcow2"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=qemu"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -189,7 +188,6 @@
filesystem="btrfs"
format="qcow2"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=qemu"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -222,7 +220,6 @@
filesystem="btrfs"
format="qcow2"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
net.ifnames=0 \$ignition_firstboot ignition.platform.id=qemu"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -254,7 +251,6 @@
filesystem="btrfs"
format="vmdk"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=vmware"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -289,7 +285,6 @@
filesystem="btrfs"
format="qcow2"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=openstack"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -323,7 +318,6 @@
filesystem="btrfs"
format="qcow2"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=openstack"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -356,7 +350,6 @@
filesystem="btrfs"
format="qcow2"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot
ignition.platform.id=digitalocean"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -390,7 +383,6 @@
filesystem="btrfs"
format="vhdx"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes rootdelay=300
console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200 net.ifnames=0
\$ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -425,7 +417,6 @@
filesystem="btrfs"
format="vdi"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=tty0
net.ifnames=0 \$ignition_firstboot ignition.platform.id=virtualbox"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -460,7 +451,6 @@
filesystem="btrfs"
fsmountoptions="noatime"
firmware="efi"
- kernelcmdline="quiet systemd.show_status=yes
console=ttyS0,115200n8 console=tty0 net.ifnames=0 \$ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -494,7 +484,6 @@
filesystem="btrfs"
fsmountoptions="noatime,compress=lzo"
firmware="efi"
- kernelcmdline="quiet systemd.show_status=yes
console=ttyS0,115200n8 console=tty0 net.ifnames=0 \$ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -528,7 +517,6 @@
filesystem="btrfs"
fsmountoptions="noatime,compress=lzo"
firmware="efi"
- kernelcmdline="quiet systemd.show_status=yes
console=ttyAMA0,115200 console=tty0 net.ifnames=0 \$ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -562,7 +550,6 @@
filesystem="btrfs"
fsmountoptions="noatime,compress=lzo"
firmware="efi"
- kernelcmdline="quiet systemd.show_status=yes
console=ttyS0,115200n8 console=tty0 net.ifnames=0 \$ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -596,7 +583,6 @@
filesystem="btrfs"
format="vagrant"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -631,7 +617,6 @@
filesystem="btrfs"
format="vagrant"
firmware="uefi"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -667,7 +652,6 @@
firmware="uefi"
initrd_system="dracut"
installiso="true"
- kernelcmdline="quiet systemd.show_status=yes console=ttyS0,115200
console=tty0 net.ifnames=0 \$ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -711,6 +695,7 @@
<package name="patterns-microos-base-zypper"/>
<package name="patterns-base-bootloader"/>
<package name="patterns-microos-defaults"/>
+ <package name="patterns-microos-selinux"/>
<package name="kernel-default"/>
</packages>
<packages type="image"
profiles="kvm-and-xen,VMware,MS-HyperV,VirtualBox,Pine64,RaspberryPi,RaspberryPi2,Rock64,Vagrant,DigitalOcean-Cloud">
@@ -724,27 +709,17 @@
<package name="patterns-microos-hardware"/>
</packages>
<packages type="image" profiles="ContainerHost">
- <namedCollection name="container_runtime"/>
<package name="patterns-containers-container_runtime"/>
- <namedCollection name="microos_apparmor"/>
- <package name="patterns-microos-apparmor"/>
</packages>
<packages type="image" profiles="k3s">
<package name="k3s"/>
</packages>
<packages type="image" profiles="Kubic-kubeadm">
- <namedCollection name="container_runtime_kubernetes"/>
<package name="patterns-containers-container_runtime_kubernetes"/>
- <namedCollection name="kubeadm"/>
<package name="patterns-containers-kubeadm"/>
- <namedCollection name="kubic_admin"/>
<package name="patterns-containers-kubic_admin"/>
- <namedCollection name="kubic_loadbalancer"/>
<package name="patterns-containers-kubic_loadbalancer"/>
- <namedCollection name="kubic_worker"/>
<package name="patterns-containers-kubic_worker"/>
- <namedCollection name="microos_apparmor"/>
- <package name="patterns-microos-apparmor"/>
</packages>
<packages type="image" profiles="kvm-and-xen">
<!-- KVM and Xen specific packages -->
@@ -758,7 +733,6 @@
<package name="hyper-v" arch="x86_64"/>
</packages>
<packages type="image" profiles="OpenStack-Cloud">
- <namedCollection name="microos_cloud"/>
<package name="patterns-microos-cloud"/>
</packages>
<packages type="image" profiles="VirtualBox">
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.IJg7xy/_old 2021-11-25 23:06:10.785188017 +0100
+++ /var/tmp/diff_new_pack.IJg7xy/_new 2021-11-25 23:06:10.785188017 +0100
@@ -149,6 +149,51 @@
sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g'
/etc/zypp/zypp.conf
#======================================
+# Add default kernel boot options
+#--------------------------------------
+serialconsole='console=ttyS0,115200'
+[[ "$kiwi_profiles" == *"RaspberryPi2" ]] &&
serialconsole='console=ttyAMA0,115200'
+
+grub_cmdline=('quiet' 'systemd.show_status=yes' "${serialconsole}"
'console=tty0' 'net.ifnames=0')
+
+ignition_platform='metal'
+case "${kiwi_profiles}" in
+ *kvm*|*SelfInstall*) ignition_platform='qemu' ;;
+ *DigitalOcean*) ignition_platform='digitalocean' ;;
+ *VMware*) ignition_platform='vmware' ;;
+ *OpenStack*) ignition_platform='openstack' ;;
+ *VirtualBox*) ignition_platform='virtualbox' ;;
+ *HyperV*) ignition_platform='metal'
+ grub_cmdline+=('rootdelay=300') ;;
+ *Pine64*|*RaspberryPi*|*Rock64*|*Vagrant*|*onie*)
ignition_platform='metal' ;;
+ *) echo "Unhandled profile?"
+ exit 1
+ ;;
+esac
+
+# One '\' for sed, one '\' for grub2-mkconfig
+grub_cmdline+=('\\$ignition_firstboot'
"ignition.platform.id=${ignition_platform}")
+
+sed -i
"s#^GRUB_CMDLINE_LINUX_DEFAULT=.*\$#GRUB_CMDLINE_LINUX_DEFAULT=\"${grub_cmdline[*]}\"#"
/etc/default/grub
+
+#======================================
+# If SELinux is installed, configure it like transactional-update setup-selinux
+#--------------------------------------
+if [[ -e /etc/selinux/config ]]; then
+ # Check if we don't have selinux already enabled.
+ grep ^GRUB_CMDLINE_LINUX_DEFAULT /etc/default/grub | grep -q
security=selinux || \
+ sed -i -e 's|\(^GRUB_CMDLINE_LINUX_DEFAULT=.*\)"|\1
security=selinux selinux=1"|g' "/etc/default/grub"
+
+ # Adjust selinux config
+ sed -i -e 's|^SELINUX=.*|SELINUX=enforcing|g' \
+ -e 's|^SELINUXTYPE=.*|SELINUXTYPE=targeted|g' \
+ "/etc/selinux/config"
+
+ # Move an /.autorelabel file from initial installation to writeable
location
+ test -f /.autorelabel && mv /.autorelabel /etc/selinux/.autorelabel
+fi
+
+#======================================
# Workaround: Force network-legacy, network-wicked is not usable (boo#1182227)
#--------------------------------------
if rpm -q ignition-dracut-grub2; then
