From dcf383b153b12eb7eb9c38e902953283d3f19f25bf68f1de3b15df9cf62fbf1a Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 16 May 2024 07:59:38 +0000 Subject: [PATCH 1/3] - Require tik-osimage-openSUSE-Aeon OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon:images/openSUSE-Aeon?expand=0&rev=11 --- openSUSE-Aeon.changes | 5 +++++ openSUSE-Aeon.kiwi | 1 + 2 files changed, 6 insertions(+) diff --git a/openSUSE-Aeon.changes b/openSUSE-Aeon.changes index bc12bc9..95cdc3b 100644 --- a/openSUSE-Aeon.changes +++ b/openSUSE-Aeon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 16 07:57:30 UTC 2024 - Richard Brown + +- Require tik-osimage-openSUSE-Aeon + ------------------------------------------------------------------- Wed May 15 08:17:59 UTC 2024 - Richard Brown diff --git a/openSUSE-Aeon.kiwi b/openSUSE-Aeon.kiwi index fba4216..7bb923d 100644 --- a/openSUSE-Aeon.kiwi +++ b/openSUSE-Aeon.kiwi @@ -52,6 +52,7 @@ + From 55a6319b0077e54e090df6909b33fcc03c5b736e4989fe4b0105785fd37b5c7b Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 16 May 2024 12:52:57 +0000 Subject: [PATCH 2/3] - libcontainers-common no longer uses storage = btrfs by default, neither should images OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon:images/openSUSE-Aeon?expand=0&rev=12 --- config.sh | 6 ------ openSUSE-Aeon.changes | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.sh b/config.sh index 1e7a05d..01427ae 100644 --- a/config.sh +++ b/config.sh @@ -114,12 +114,6 @@ EOF chmod a+x /etc/fstab.script -# Use the btrfs storage driver. This is usually detected in %post, but with kiwi -# that happens outside of the final FS. -if [ -e /etc/containers/storage.conf ]; then - sed -i 's/driver = "overlay"/driver = "btrfs"/g' /etc/containers/storage.conf -fi - #====================================== # Enable NetworkManager #-------------------------------------- diff --git a/openSUSE-Aeon.changes b/openSUSE-Aeon.changes index 95cdc3b..7f72a8e 100644 --- a/openSUSE-Aeon.changes +++ b/openSUSE-Aeon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 16 12:51:10 UTC 2024 - Richard Brown + +- libcontainers-common no longer uses storage = btrfs by default, + neither should images + ------------------------------------------------------------------- Thu May 16 07:57:30 UTC 2024 - Richard Brown From 3d88b2ce796bdbcb11597a40f9be4e1d46c3f95e676a9cfb6960c68458873811 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 16 May 2024 13:17:59 +0000 Subject: [PATCH 3/3] - Remove redundant relabelling (done better by kiwi now) - Shift growfs to initrd OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon:images/openSUSE-Aeon?expand=0&rev=13 --- config.sh | 15 +++++---------- openSUSE-Aeon.changes | 6 ++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/config.sh b/config.sh index 01427ae..97748ba 100644 --- a/config.sh +++ b/config.sh @@ -102,18 +102,13 @@ set -eux gawk -i inplace '$2 == "/home" { $4 = $4",x-systemd.growfs" } { print $0 }' /etc/fstab EOF -cat >>/etc/fstab.script <<"EOF" -# Relabel /etc. While kiwi already relabelled it earlier, there are some files created later (boo#1210604). -# The "gawk -i inplace" above also removes the label on /etc/fstab. -if [ -e /etc/selinux/config ]; then - . /etc/selinux/config - touch /etc/sysconfig/bootloader # Make sure this exists so it gets labelled - setfiles -e /proc -e /sys -e /dev /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts /etc -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 + #====================================== # Enable NetworkManager #-------------------------------------- diff --git a/openSUSE-Aeon.changes b/openSUSE-Aeon.changes index 7f72a8e..f8680b4 100644 --- a/openSUSE-Aeon.changes +++ b/openSUSE-Aeon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 16 13:16:58 UTC 2024 - Richard Brown + +- Remove redundant relabelling (done better by kiwi now) +- Shift growfs to initrd + ------------------------------------------------------------------- Thu May 16 12:51:10 UTC 2024 - Richard Brown