Accepting request 1174594 from devel:microos:aeon:images
Hi ana, another day, another bugfix OBS-URL: https://build.opensuse.org/request/show/1174594 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openSUSE-Aeon?expand=0&rev=4
This commit is contained in:
commit
2cab0b2585
19
config.sh
19
config.sh
@ -102,23 +102,12 @@ 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
|
||||
|
||||
# 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
|
||||
# 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
|
||||
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- libcontainers-common no longer uses storage = btrfs by default,
|
||||
neither should images
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 16 07:57:30 UTC 2024 - Richard Brown <rbrown@suse.com>
|
||||
|
||||
- Require tik-osimage-openSUSE-Aeon
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 15 08:17:59 UTC 2024 - Richard Brown <rbrown@suse.com>
|
||||
|
||||
|
@ -52,6 +52,7 @@
|
||||
<package name="patterns-tik-base"/>
|
||||
<package name="tik-module-welcome"/>
|
||||
<package name="tik-module-mig"/>
|
||||
<package name="tik-osimage-openSUSE-Aeon"/>
|
||||
</packages>
|
||||
<packages type="bootstrap">
|
||||
<!-- Avoid that zypper picks the busybox-foo variant for those, that would fail later -->
|
||||
|
Loading…
Reference in New Issue
Block a user