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