Plus some extras I'm throwing in for free :) To understand why these changes are needed, see the original bug report[1] as well as the discussion triggered by Martin's initial attempt at addressing it[2]. Getting this right is quite tricky, so in order to convince myself that I'm not just going to break everyone's deployment I've tested things fairly extensively. In particular, I've verified that things work as expected when upgrading from libvirt 9.0.0 (e.g. pre-split) on AlmaLinux 8 when the initial configuration is * a default one (socket-activated monolithic daemon); * monolithic daemon with --listen; * modular daemons; * modular daemons with virtproxyd-tcp.socket enabled; as well as when installing from scratch with * no particular configuration; * local systemd preset overrides that result in the modular daemons being preferred to the monolithic one. Everything seems to work fine, but further testing would certainly be more than welcome! [1] https://bugzilla.redhat.com/show_bug.cgi?id=2210058 [2] https://listman.redhat.com/archives/libvir-list/2023-June/240226.html Andrea Bolognani (8): rpm: Bump min_fedora rpm: Style/alignment tweaks rpm: Reorder scriptlets rpm: Reduce use of with_modular_daemons rpm: Remove custom libvirtd restart logic rpm: Introduce new macros for handling of systemd units rpm: Switch to new macros for handling of systemd units rpm: Delete unused macros libvirt.spec.in | 453 +++++++++++++++++++++++++----------------------- 1 file changed, 232 insertions(+), 221 deletions(-) -- 2.41.0