- 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
This commit is contained in:
Richard Brown 2024-05-16 13:17:59 +00:00 committed by Git OBS Bridge
parent 55a6319b00
commit 3d88b2ce79
2 changed files with 11 additions and 10 deletions

View File

@ -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
#--------------------------------------

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 16 13:16:58 UTC 2024 - Richard Brown <rbrown@suse.com>
- Remove redundant relabelling (done better by kiwi now)
- Shift growfs to initrd
-------------------------------------------------------------------
Thu May 16 12:51:10 UTC 2024 - Richard Brown <rbrown@suse.com>