Hello community,
here is the log from the commit of package openSUSE-MicroOS for
openSUSE:Factory checked in at 2019-11-15 00:31:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-MicroOS"
Fri Nov 15 00:31:31 2019 rev:10 rq:748700 version:16.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes
2019-11-11 21:37:29.528606931 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.26869/openSUSE-MicroOS.changes
2019-11-15 00:31:32.555728634 +0100
@@ -8,0 +9,13 @@
+Wed Oct 9 14:52:16 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Add VirtualBox flavor
+- Make /var a separate autoexpanding partition for VMX flavors:
+ * Allows enabling qgroups on / again
+ * On OEM this would result in >15GiB images, so skip those
+- Drop hardware flavor, meanwhile there's no difference anymore
+- Todo:
+ * Make /var no-COW once
+ https://github.com/OSInside/kiwi/issues/1233 is implemented
+- Use grub2-x86_64-xen instead of just grub2-xen
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-MicroOS.kiwi ++++++
--- /var/tmp/diff_new_pack.Ys6lkO/_old 2019-11-15 00:31:33.127728590 +0100
+++ /var/tmp/diff_new_pack.Ys6lkO/_new 2019-11-15 00:31:33.131728591 +0100
@@ -16,11 +16,11 @@
<profile name="VMware" description="VMware for x86_64" arch="x86_64"/>
<profile name="MS-HyperV" description="Hyper-V for x86_64"
arch="x86_64"/>
<profile name="OpenStack-Cloud" description="OpenStack Cloud for
x86_64" arch="x86_64"/>
+ <profile name="VirtualBox" description="VirtualBox for x86_64"
arch="x86_64"/>
<profile name="Pine64" description="Pine64" arch="aarch64"/>
<profile name="RaspberryPi" description="RaspberryPi (3+, aarch64)"
arch="aarch64"/>
<profile name="RaspberryPi2" description="RaspberryPi2 (armv7)"
arch="armv7l"/>
<profile name="Vagrant" description="Vagrant for x86_64"
arch="x86_64"/>
- <profile name="hardware" description="physical x86_64 hardware"
arch="x86_64"/>
<!-- Images (flavor + platform) -->
<profile name="ContainerHost-kvm-and-xen" description="MicroOS with
Podman for KVM and HVM Xen" arch="x86_64">
<requires profile="kvm-and-xen"/>
@@ -50,10 +50,6 @@
<requires profile="Vagrant"/>
<requires profile="ContainerHost"/>
</profile>
- <profile name="ContainerHost-hardware" description="MicroOS with
Podman for physical hardware" arch="x86_64">
- <requires profile="hardware"/>
- <requires profile="ContainerHost"/>
- </profile>
<profile name="Kubic-kubeadm-kvm-and-xen" description="kubeadm with
CRI-O for KVM and HVM Xen" arch="x86_64">
<requires profile="kvm-and-xen"/>
<requires profile="Kubic-kubeadm"/>
@@ -82,10 +78,6 @@
<requires profile="Vagrant"/>
<requires profile="Kubic-kubeadm"/>
</profile>
- <profile name="Kubic-kubeadm-hardware" description="kubeadm with CRI-O
for physical x86_64 hardware" arch="x86_64">
- <requires profile="hardware"/>
- <requires profile="Kubic-kubeadm"/>
- </profile>
</profiles>
<preferences profiles="kvm-and-xen">
<version>16.0.0</version>
@@ -106,7 +98,8 @@
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="false"
+ btrfs_quota_groups="true"
+ spare_part="5G" spare_part_mountpoint="/var" spare_part_fs="btrfs"
spare_part_is_last="true"
>
<systemdisk>
<volume name="home"/>
@@ -118,9 +111,8 @@
<volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
</systemdisk>
- <size unit="G">24</size>
+ <size unit="G">20</size>
</type>
</preferences>
<preferences profiles="VMware">
@@ -142,7 +134,8 @@
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="false"
+ btrfs_quota_groups="true"
+ spare_part="5G" spare_part_mountpoint="/var" spare_part_fs="btrfs"
spare_part_is_last="true"
>
<systemdisk>
<volume name="home"/>
@@ -154,7 +147,6 @@
<volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
</systemdisk>
<size unit="G">24</size>
<machine memory="1024" HWversion="10" guestOS="suse-64"/>
@@ -179,7 +171,8 @@
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="false"
+ btrfs_quota_groups="true"
+ spare_part="5G" spare_part_mountpoint="/var" spare_part_fs="btrfs"
spare_part_is_last="true"
>
<systemdisk>
<volume name="home"/>
@@ -191,7 +184,6 @@
<volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
</systemdisk>
<size unit="G">24</size>
</type>
@@ -216,7 +208,8 @@
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="false"
+ btrfs_quota_groups="true"
+ spare_part="5G" spare_part_mountpoint="/var" spare_part_fs="btrfs"
spare_part_is_last="true"
>
<systemdisk>
<volume name="home"/>
@@ -228,33 +221,32 @@
<volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
</systemdisk>
<!-- Microsoft wants 30GB images -->
<size unit="G">30</size>
</type>
</preferences>
- <preferences profiles="Pine64">
+ <preferences profiles="VirtualBox">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
- image="oem"
- initrd_system="dracut"
+ image="vmx"
filesystem="btrfs"
- fsmountoptions="noatime,compress=lzo"
+ format="vdi"
bootloader="grub2"
- firmware="efi"
- kernelcmdline="loglevel=3 splash=silent plymouth.enable=0
console=ttyS0,115200n8 \$ignition_firstboot ignition.platform.id=metal"
+ bootloader_console="gfxterm"
+ firmware="uefi"
+ kernelcmdline="plymouth.enable=0 console=tty0 net.ifnames=0
\$ignition_firstboot ignition.platform.id=virtualbox"
bootpartition="false"
+ bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
- efipartsize="16"
- editbootinstall="editbootinstall_pine64.sh"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="false"
+ btrfs_quota_groups="true"
+ spare_part="5G" spare_part_mountpoint="/var" spare_part_fs="btrfs"
spare_part_is_last="true"
>
<systemdisk>
<volume name="home"/>
@@ -262,14 +254,15 @@
<volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
- <volume name="boot/grub2/arm64-efi"
mountpoint="boot/grub2/arm64-efi"/>
+ <volume name="boot/grub2/i386-pc"/>
+ <volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
</systemdisk>
+ <size unit="G">20</size>
</type>
</preferences>
- <preferences profiles="RaspberryPi">
+ <preferences profiles="Pine64">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
@@ -281,14 +274,13 @@
filesystem="btrfs"
fsmountoptions="noatime,compress=lzo"
bootloader="grub2"
- bootloader_console="gfxterm"
firmware="efi"
kernelcmdline="plymouth.enable=0 swiotlb=512 cma=64M
console=ttyS0,115200n8 console=tty \$ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
efipartsize="16"
- editbootinstall="editbootinstall_rpi.sh"
+ editbootinstall="editbootinstall_pine64.sh"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
>
@@ -305,7 +297,7 @@
</systemdisk>
</type>
</preferences>
- <preferences profiles="RaspberryPi2">
+ <preferences profiles="RaspberryPi">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
@@ -334,31 +326,33 @@
<volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
- <volume name="boot/grub2/arm-efi"
mountpoint="boot/grub2/arm-efi"/>
+ <volume name="boot/grub2/arm64-efi"
mountpoint="boot/grub2/arm64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
<volume name="var" copy_on_write="false"/>
</systemdisk>
</type>
</preferences>
- <preferences profiles="Vagrant">
+ <preferences profiles="RaspberryPi2">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
- image="vmx"
+ image="oem"
+ initrd_system="dracut"
filesystem="btrfs"
- format="vagrant"
+ fsmountoptions="noatime,compress=lzo"
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
net.ifnames=0 \$ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
- bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
+ efipartsize="16"
+ editbootinstall="editbootinstall_rpi.sh"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
>
@@ -368,17 +362,14 @@
<volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
- <volume name="boot/grub2/i386-pc"/>
- <volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
+ <volume name="boot/grub2/arm-efi"
mountpoint="boot/grub2/arm-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
<volume name="var" copy_on_write="false"/>
</systemdisk>
- <vagrantconfig provider="libvirt" virtualsize="24"/>
- <size unit="G">24</size>
</type>
</preferences>
- <preferences profiles="hardware">
+ <preferences profiles="Vagrant">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
@@ -387,7 +378,7 @@
<type
image="vmx"
filesystem="btrfs"
- format="qcow2"
+ format="vagrant"
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
@@ -397,7 +388,8 @@
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
- btrfs_quota_groups="false"
+ btrfs_quota_groups="true"
+ spare_part="5G" spare_part_mountpoint="/var" spare_part_fs="btrfs"
spare_part_is_last="true"
>
<systemdisk>
<volume name="home"/>
@@ -409,8 +401,8 @@
<volume name="boot/grub2/x86_64-efi"
mountpoint="boot/grub2/x86_64-efi"/>
<volume name="boot/writable"/>
<volume name="usr/local"/>
- <volume name="var" copy_on_write="false"/>
</systemdisk>
+ <vagrantconfig provider="libvirt" virtualsize="24"/>
<size unit="G">24</size>
</type>
</preferences>
@@ -441,6 +433,7 @@
<namedCollection name="microos_cloud"/>
<package name="patterns-microos-cloud"/>
<package name="ignition-dracut"/>
+ <package name="growpart-generator"/>
</packages>
<packages type="image" profiles="ContainerHost">
<namedCollection name="container_runtime"/>
@@ -461,7 +454,7 @@
<packages type="image" profiles="kvm-and-xen">
<!-- XEN specific packages -->
<package name="xen-tools-domU" arch="x86_64"/>
- <package name="grub2-xen" arch="x86_64"/>
+ <package name="grub2-x86_64-xen" arch="x86_64"/>
<package name="xen-libs" arch="x86_64"/>
<package name="kernel-default"/>
<package name="qemu-guest-agent"/>
@@ -478,6 +471,10 @@
<package name="cloud-init"/>
<package name="kernel-default"/>
</packages>
+ <packages type="image" profiles="VirtualBox">
+ <package name="kernel-default"/>
+ <package name="virtualbox-guest-tools"/>
+ </packages>
<packages type="image" profiles="Pine64">
<package name="u-boot-pine64plus" arch="aarch64"/>
<package name="dracut-kiwi-oem-repart"/>
@@ -513,10 +510,6 @@
<!-- vagrant-libvirt uses nfs for synced folders -->
<package name="nfs-client"/>
</packages>
- <packages type="image" profiles="hardware">
- <package name="kernel-default"/>
- <package name="kernel-firmware"/>
- </packages>
<packages type="bootstrap">
<package name="udev"/>
<package name="filesystem"/>
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.Ys6lkO/_old 2019-11-15 00:31:33.175728587 +0100
+++ /var/tmp/diff_new_pack.Ys6lkO/_new 2019-11-15 00:31:33.175728587 +0100
@@ -1,6 +1,7 @@
<multibuild>
- <!-- Special case: The Pi2 only gets plain MicroOS -->
+ <!-- Special case: Pi2 and VBox only get plain MicroOS -->
<flavor>RaspberryPi2</flavor>
+ <flavor>VirtualBox</flavor>
<!--
for a in kvm-and-xen VMware MS-HyperV OpenStack-Cloud Pine64
RaspberryPi Vagrant hardware; do
for f in "" "ContainerHost-" "Kubic-kubeadm-"; do
@@ -29,7 +30,4 @@
<flavor>Vagrant</flavor>
<flavor>ContainerHost-Vagrant</flavor>
<flavor>Kubic-kubeadm-Vagrant</flavor>
- <flavor>hardware</flavor>
- <flavor>ContainerHost-hardware</flavor>
- <flavor>Kubic-kubeadm-hardware</flavor>
</multibuild>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.Ys6lkO/_old 2019-11-15 00:31:33.187728586 +0100
+++ /var/tmp/diff_new_pack.Ys6lkO/_new 2019-11-15 00:31:33.191728586 +0100
@@ -142,8 +142,23 @@
# The %post script can't edit /etc/fstab sys due to
https://github.com/OSInside/kiwi/issues/945
# so use the kiwi custom hack
+cat >/etc/fstab.script <<"EOF"
+#!/bin/sh
+set -eux
-cp /usr/sbin/setup-fstab-for-overlayfs /etc/fstab.script
+/usr/sbin/setup-fstab-for-overlayfs
+# If /var is on a different partition than /...
+if [ "$(findmnt -snT / -o SOURCE)" != "$(findmnt -snT /var -o SOURCE)" ]; then
+ # ... set options for autoexpanding /var
+ gawk -i inplace '$2 == "/var" { $4 =
$4",x-growpart.grow,x-systemd.growfs" } { print $0 }' /etc/fstab
+fi
+EOF
+chmod a+x /etc/fstab.script
+
+# To make x-systemd.growfs work from inside the initrd
+cat >/etc/dracut.conf.d/50-microos-growfs.conf <<"EOF"
+install_items+=" /usr/lib/systemd/systemd-growfs "
+EOF
#======================================
# Configure Pine64 specifics
