This series addresses two pieces of feedback from my recent systemd
changes: that some settings, such as LimitNOFILE, where still being
repeated verbatim in multiple locations, and that only having the
foo.{service,socket}.extra.in files for some services and not others
could be confusing.
Andrea Bolognani (11):
systemd: libvirtd doesn't need @sockprefix@
systemd: Support merging multiple units
systemd: Accept multiple files for service_extra_in/socket_extra_in
systemd: Introduce systemd_service_limitnofile_extra
systemd: Introduce systemd_service_taskmax_extra
systemd: Introduce systemd_service_limitmemlock_extra
systemd: Introduce systemd_service_oomscoreadjust_extra
systemd: Allow comments at the top of units
systemd: Set service_extra_in/socket_extra_in everywhere
systemd: Make service_extra_in/socket_extra_in required
systemd: Tweak service definitions
scripts/merge-systemd-units.py | 20 +++++++---
src/ch/meson.build | 10 ++++-
src/ch/virtchd.service.extra.in | 18 ++-------
src/ch/virtchd.socket.extra.in | 2 +
src/interface/meson.build | 6 +++
src/interface/virtinterfaced.service.extra.in | 2 +
src/interface/virtinterfaced.socket.extra.in | 2 +
src/libxl/meson.build | 8 +++-
src/libxl/virtxend.service.extra.in | 3 ++
src/libxl/virtxend.socket.extra.in | 3 ++
src/locking/meson.build | 10 ++++-
src/locking/virtlockd.service.extra.in | 2 +
src/locking/virtlockd.service.in | 8 ----
src/locking/virtlockd.socket.extra.in | 2 +
src/logging/meson.build | 10 ++++-
src/logging/virtlogd.service.extra.in | 2 +
src/logging/virtlogd.service.in | 8 ----
src/logging/virtlogd.socket.extra.in | 2 +
src/lxc/meson.build | 10 ++++-
src/lxc/virtlxcd.service.extra.in | 18 ++-------
src/lxc/virtlxcd.socket.extra.in | 2 +
src/meson.build | 40 ++++++++++---------
src/network/meson.build | 7 +++-
src/network/virtnetworkd.service.extra.in | 3 ++
src/network/virtnetworkd.socket.extra.in | 2 +
src/node_device/meson.build | 6 +++
src/node_device/virtnodedevd.service.extra.in | 2 +
src/node_device/virtnodedevd.socket.extra.in | 2 +
src/nwfilter/meson.build | 6 +++
src/nwfilter/virtnwfilterd.service.extra.in | 2 +
src/nwfilter/virtnwfilterd.socket.extra.in | 2 +
src/qemu/meson.build | 10 ++++-
src/qemu/virtqemud.service.extra.in | 18 ++-------
src/qemu/virtqemud.socket.extra.in | 2 +
src/remote/libvirtd.service.extra.in | 2 +
src/remote/libvirtd.service.in | 15 -------
src/remote/libvirtd.socket.extra.in | 2 +
src/remote/meson.build | 18 ++++++++-
src/remote/virtproxyd.service.extra.in | 2 +
src/remote/virtproxyd.socket.extra.in | 2 +
src/secret/meson.build | 6 +++
src/secret/virtsecretd.service.extra.in | 2 +
src/secret/virtsecretd.socket.extra.in | 2 +
src/storage/meson.build | 7 +++-
src/storage/virtstoraged.service.extra.in | 3 ++
src/storage/virtstoraged.socket.extra.in | 2 +
src/vbox/meson.build | 7 +++-
src/vbox/virtvboxd.service.extra.in | 3 ++
src/vbox/virtvboxd.socket.extra.in | 2 +
src/virtd.service.limitmemlock.extra.in | 7 ++++
src/virtd.service.limitnofile.extra.in | 5 +++
src/virtd.service.oomscoreadjust.extra.in | 5 +++
src/virtd.service.tasksmax.extra.in | 6 +++
src/vz/meson.build | 7 +++-
src/vz/virtvzd.service.extra.in | 3 ++
src/vz/virtvzd.socket.extra.in | 2 +
56 files changed, 248 insertions(+), 112 deletions(-)
create mode 100644 src/ch/virtchd.socket.extra.in
create mode 100644 src/interface/virtinterfaced.service.extra.in
create mode 100644 src/interface/virtinterfaced.socket.extra.in
create mode 100644 src/locking/virtlockd.service.extra.in
create mode 100644 src/locking/virtlockd.socket.extra.in
create mode 100644 src/logging/virtlogd.service.extra.in
create mode 100644 src/logging/virtlogd.socket.extra.in
create mode 100644 src/lxc/virtlxcd.socket.extra.in
create mode 100644 src/network/virtnetworkd.socket.extra.in
create mode 100644 src/node_device/virtnodedevd.service.extra.in
create mode 100644 src/node_device/virtnodedevd.socket.extra.in
create mode 100644 src/nwfilter/virtnwfilterd.service.extra.in
create mode 100644 src/nwfilter/virtnwfilterd.socket.extra.in
create mode 100644 src/qemu/virtqemud.socket.extra.in
create mode 100644 src/remote/libvirtd.service.extra.in
create mode 100644 src/remote/libvirtd.socket.extra.in
create mode 100644 src/remote/virtproxyd.service.extra.in
create mode 100644 src/remote/virtproxyd.socket.extra.in
create mode 100644 src/secret/virtsecretd.service.extra.in
create mode 100644 src/secret/virtsecretd.socket.extra.in
create mode 100644 src/storage/virtstoraged.socket.extra.in
create mode 100644 src/vbox/virtvboxd.socket.extra.in
create mode 100644 src/virtd.service.limitmemlock.extra.in
create mode 100644 src/virtd.service.limitnofile.extra.in
create mode 100644 src/virtd.service.oomscoreadjust.extra.in
create mode 100644 src/virtd.service.tasksmax.extra.in
create mode 100644 src/vz/virtvzd.socket.extra.in
--
2.41.0
