Skip to content

Commit

Permalink
rpm: add %systemd_user_daemon_reexec
Browse files Browse the repository at this point in the history
This macros wraps the call to daemon-reexec in all user managers. It would be
called for example from systemd %post right after the call to systemctl
daemon-reexec.

This will be used in the Fedora systemd package to fix a long-standing FIXME.

Tested via building and reinstalling the systemd package with the patches.

(cherry picked from commit 9ff28e3)

Resolves: RHEL-40878
  • Loading branch information
keszybz authored and jamacku committed Jun 12, 2024
1 parent 95da706 commit 96ee066
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/rpm/macros.systemd.in
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@ if [ $1 -ge 1 ] && [ -x "{{SYSTEMD_UPDATE_HELPER_PATH}}" ]; then \
fi \
%{nil}

%systemd_user_daemon_reexec() \
if [ $1 -ge 1 ] && [ -x "{{SYSTEMD_UPDATE_HELPER_PATH}}" ]; then \
# Package upgrade, not uninstall \
{{SYSTEMD_UPDATE_HELPER_PATH}} user-reexec || : \
fi \
%{nil}

%udev_hwdb_update() %{nil}

%udev_rules_update() %{nil}
Expand Down

0 comments on commit 96ee066

Please sign in to comment.