A grab bag of changes, ranging from very much functional ones to purely aesthetical ones. Patches 01-05 fix a few inconsistencies that the units for virtlogd/virtlockd had compared to the ones for all other services. Patches 06-16 prepare the stage for the mass conversion of unit files to set of common templates; patches 17-32 are where the conversion actually happen. After this point, most units are based on the common templates, which will hopefully make it less painful to maintain them going forward. The remaining patches should prove this point. Patches 33-34 reorganize conflict relationships so that the nastiest interactions between modular daemons and libvirtd can no longer happen. Patches 35-42 contain a few additional improvements and cleanups. Andrea Bolognani (42): systemd: Add missing Also for admin socket systemd: Add missing WantedBy for virtlogd/virtlockd systemd: Add missing Service for virtlogd/virtlockd systemd: Set Type=notify for virtlogd/virtlockd systemd: Set @name@ for virtlogd/virtlockd systemd: Rename socket_in_def -> socket_in_default systemd: Rename @mode@ -> @sockmode@ systemd: Only set @sockmode@ once systemd: Drop unnecessary uses of @sockets@ systemd: Make @sockprefix@ optional systemd: Drop unnecessary uses of @sockprefix@ systemd: Make @service_in@ optional systemd: Introduce temporary libvirtd_socket*_in values systemd: Provide all input files explicitly systemd: Introduce common templates systemd: Use common templates by default systemd: Switch virtnodedevd to common templates systemd: Switch virtinterfaced to common templates systemd: Switch virtnwfilterd to common templates systemd: Switch virtsecretd to common templates systemd: Switch virtnetworkd to common templates systemd: Switch virtstoraged to common templates systemd: Switch virtproxyd to common templates systemd: Switch virtvboxd to common templates systemd: Switch virtvzd to common templates systemd: Switch virtchd to common templates systemd: Switch virtxend to common templates systemd: Switch virtlxcd to common templates systemd: Switch virtqemud to common templates systemd: Drop libvirtd_socket*_in values systemd: Drop @deps@ systemd: Drop parametrization from libvirtd sockets systemd: Drop Conflicts from virtproxyd sockets systemd: Make modular daemons conflict with libvirtd systemd: Replace Requires with BindTo+After for sockets systemd: Augment Requires/Wants with After systemd: Drop Before=libvirtd from virtlogd/virtlockd systemd: Drop Before=foo.service from sockets systemd: Add Also between sockets systemd: Drop BindTo/After between sockets systemd: Improve and unify unit descriptions systemd: Move Documentation lines src/ch/meson.build | 28 ++++++++++++--- src/ch/virtchd.service.in | 44 ----------------------- src/interface/meson.build | 5 +-- src/interface/virtinterfaced.service.in | 25 ------------- src/libxl/meson.build | 23 +++++++++--- src/libxl/virtxend.service.in | 32 ----------------- src/locking/meson.build | 3 +- src/locking/virtlockd-admin.socket.in | 6 ++-- src/locking/virtlockd.service.in | 14 +++++--- src/locking/virtlockd.socket.in | 5 +-- src/logging/meson.build | 3 +- src/logging/virtlogd-admin.socket.in | 6 ++-- src/logging/virtlogd.service.in | 14 +++++--- src/logging/virtlogd.socket.in | 5 +-- src/lxc/meson.build | 28 ++++++++++++--- src/lxc/virtlxcd.service.in | 44 ----------------------- src/meson.build | 46 ++++++++++++++---------- src/network/meson.build | 8 ++--- src/network/virtnetworkd.service.in | 26 -------------- src/node_device/meson.build | 5 +-- src/node_device/virtnodedevd.service.in | 25 ------------- src/nwfilter/meson.build | 5 +-- src/nwfilter/virtnwfilterd.service.in | 25 ------------- src/qemu/meson.build | 36 ++++++++++++++++--- src/qemu/virtqemud.service.in | 48 ------------------------- src/remote/libvirtd-admin.socket.in | 12 +++---- src/remote/libvirtd-ro.socket.in | 12 +++---- src/remote/libvirtd-tcp.socket.in | 8 ++--- src/remote/libvirtd-tls.socket.in | 8 ++--- src/remote/libvirtd.service.in | 14 +++++--- src/remote/libvirtd.socket.in | 12 +++---- src/remote/meson.build | 13 +++---- src/remote/virtproxyd.service.in | 25 ------------- src/secret/meson.build | 5 +-- src/secret/virtsecretd.service.in | 25 ------------- src/storage/meson.build | 9 ++--- src/storage/virtstoraged.service.in | 27 -------------- src/vbox/meson.build | 8 ++--- src/vbox/virtvboxd.service.in | 26 -------------- src/virtd-admin.socket.in | 17 +++++++++ src/virtd-ro.socket.in | 17 +++++++++ src/virtd-tcp.socket.in | 14 ++++++++ src/virtd-tls.socket.in | 14 ++++++++ src/virtd.service.in | 32 +++++++++++++++++ src/virtd.socket.in | 18 ++++++++++ src/vz/meson.build | 8 ++--- src/vz/virtvzd.service.in | 26 -------------- 47 files changed, 326 insertions(+), 533 deletions(-) delete mode 100644 src/ch/virtchd.service.in delete mode 100644 src/interface/virtinterfaced.service.in delete mode 100644 src/libxl/virtxend.service.in delete mode 100644 src/lxc/virtlxcd.service.in delete mode 100644 src/network/virtnetworkd.service.in delete mode 100644 src/node_device/virtnodedevd.service.in delete mode 100644 src/nwfilter/virtnwfilterd.service.in delete mode 100644 src/qemu/virtqemud.service.in delete mode 100644 src/remote/virtproxyd.service.in delete mode 100644 src/secret/virtsecretd.service.in delete mode 100644 src/storage/virtstoraged.service.in delete mode 100644 src/vbox/virtvboxd.service.in create mode 100644 src/virtd-admin.socket.in create mode 100644 src/virtd-ro.socket.in create mode 100644 src/virtd-tcp.socket.in create mode 100644 src/virtd-tls.socket.in create mode 100644 src/virtd.service.in create mode 100644 src/virtd.socket.in delete mode 100644 src/vz/virtvzd.service.in -- 2.41.0