On Wed, Feb 16, 2022 at 05:38:43PM +0000, Daniel P. Berrangé wrote: > On Wed, Feb 16, 2022 at 05:56:33PM +0100, Ján Tomko wrote: > > On a Wednesday in 2022, Daniel P. Berrangé wrote: > > > The systemd version in RHEL-7 lacked support for the LISTEN_FDNAMES env > > > variable with socket activation. Since we stopped targetting RHEL-7 we > > > can drop some considerable amount of compatibility code. > > > > > > Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> > > > --- > > > src/locking/lock_daemon.c | 8 +-- > > > src/logging/log_daemon.c | 8 +-- > > > src/remote/remote_daemon.c | 19 +----- > > > src/util/virsystemd.c | 117 ++++--------------------------------- > > > src/util/virsystemd.h | 15 +---- > > > tests/virsystemdtest.c | 38 ++---------- > > > 6 files changed, 18 insertions(+), 187 deletions(-) > > > > > > > Reviewed-by: Ján Tomko <jtomko@xxxxxxxxxx> > > > > Jano > > > > Also, the following comments can be eleminiated: > > > > $ git grep systemd.*227 > > src/remote/libvirtd-admin.socket.in:# when using systemd version < 227 > > src/remote/libvirtd-ro.socket.in:# when using systemd version < 227 > > src/remote/libvirtd-tcp.socket.in:# when using systemd version < 227 > > src/remote/libvirtd-tls.socket.in:# when using systemd version < 227 > > src/remote/libvirtd.conf.in:# activation with systemd version >= 227 > > src/remote/libvirtd.conf.in:# activation with systemd version >= 227 > > src/remote/libvirtd.conf.in:# activation with systemd version >= 227 > > src/remote/libvirtd.socket.in:# when using systemd version < 227 > > Oh, well spotted. There were docs references too, so I'll send a v2 for completeness. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|