dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-13 17:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysext: honor confext config during notify refresh

Browse Source 
systemd-sysext handles the sysupdate notification hook,
but the hook refreshes both sysexts and confexts.

Build the refresh context for each image class so confext settings,
such as Mutable=yes, are applied when confexts are refreshed.

Add regression coverage for the mutable confext overlay.

Fixes #42873
Signed-off-by: dongshengyuan <dongshengyuan@uniontech.com>
This commit is contained in:
dongshengyuan
2026-07-06 10:51:28 +08:00
committed by Lennart Poettering
parent 0e7033215d
commit 34649e3d66
2 changed files with 439 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

701
src/sysext/sysext.c
View File

File diff suppressed because it is too large Load Diff

49
test/units/TEST-50-DISSECT.dissect.sh
View File

@@ -1082,6 +1082,55 @@ systemd-confext status
systemd-confext unmerge
rm -rf /run/confexts/
cleanup_sysupdate_notify_confext_mutable() {
local mutable_marker="$1"
local notify_socket_was_active="$2"
if [[ "$notify_socket_was_active" == "yes" ]]; then
systemctl restart systemd-sysupdate-notify-sysext.socket || :
else
systemctl stop systemd-sysupdate-notify-sysext.socket || :
fi
rm -f "$mutable_marker"
rm -f "/var/lib/extensions.mutable/etc/${mutable_marker#/etc/}"
systemd-confext unmerge || :
rm -f /run/systemd/confext.conf.d/50-test-mutable.conf
rm -rf /run/confexts/
rmdir /var/lib/extensions.mutable/etc /var/lib/extensions.mutable 2>/dev/null || :
}
test_sysupdate_notify_confext_mutable() {
local mutable_marker="/etc/test-confext-mutable-$RANDOM"
local notify_socket_was_active=no
if systemctl is-active --quiet systemd-sysupdate-notify-sysext.socket; then
notify_socket_was_active=yes
fi
trap 'cleanup_sysupdate_notify_confext_mutable "$mutable_marker" "$notify_socket_was_active"' RETURN ERR
# Check that the sysupdate notification refresh honors confext-specific configuration.
mkdir -p /run/systemd/confext.conf.d
cat >/run/systemd/confext.conf.d/50-test-mutable.conf <<EOF
[ConfExt]
Mutable=yes
EOF
mkdir -p /run/confexts/test/etc/extension-release.d
echo "ID=_any" >/run/confexts/test/etc/extension-release.d/extension-release.test
echo "ARCHITECTURE=_any" >>/run/confexts/test/etc/extension-release.d/extension-release.test
echo "MARKER_CONFEXT_123" >/run/confexts/test/etc/testfile
systemd-confext merge
echo "MARKER_CONFEXT_MUTABLE" >"$mutable_marker"
systemctl start systemd-sysupdate-notify-sysext.socket
varlinkctl call /run/systemd/sysupdate/notify/io.systemd.sysext io.systemd.SysUpdate.Notify.OnCompletedUpdate '{}'
grep -F "MARKER_CONFEXT_MUTABLE" "$mutable_marker" >/dev/null
trap - RETURN ERR
cleanup_sysupdate_notify_confext_mutable "$mutable_marker" "$notify_socket_was_active"
}
test_sysupdate_notify_confext_mutable
unsquashfs -force -no-xattrs -d /tmp/img "$MINIMAL_IMAGE.raw"
systemd-run --unit=test-root-ephemeral \
-p RootDirectory=/tmp/img \