Similarly to commit ec7e31ed3206, allow traditional daemon activation for virtproxyd. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/remote/virtproxyd.service.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in index f9bb6b84a97a..2557539fca8f 100644 --- a/src/remote/virtproxyd.service.in +++ b/src/remote/virtproxyd.service.in @@ -1,9 +1,9 @@ [Unit] Description=Virtualization daemon Conflicts=libvirtd.service -Requires=virtproxyd.socket -Requires=virtproxyd-ro.socket -Requires=virtproxyd-admin.socket +Wants=virtproxyd.socket +Wants=virtproxyd-ro.socket +Wants=virtproxyd-admin.socket After=network.target After=dbus.service After=apparmor.service -- 2.38.0

Due to the setup of the modular daemon service files the reverting to non-socket activated daemons could have never worked. The reason is that masking the socket files prevents starting the daemons since they require (as in Requires= rather than Wants= in the service file) the sockets. On top of that it creates issues with some libvirt-guests setups and needlessly increases our support matrix. Nothing prevents users to modify their setup in a way that will still work without socket activation, but supporting such setup only creates burden on our part. This technically reverts most of commit 59d30adacd1d except the change made to the libvirtd manpage since the monolithic daemon still supports traditional mode of starting even on systemd. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- docs/manpages/virtinterfaced.rst | 23 +++++++++---------- docs/manpages/virtlxcd.rst | 37 +++++++++---------------------- docs/manpages/virtnetworkd.rst | 23 +++++++++---------- docs/manpages/virtnodedevd.rst | 23 +++++++++---------- docs/manpages/virtnwfilterd.rst | 23 +++++++++---------- docs/manpages/virtqemud.rst | 37 +++++++++---------------------- docs/manpages/virtsecretd.rst | 23 +++++++++---------- docs/manpages/virtstoraged.rst | 23 +++++++++---------- docs/manpages/virtvboxd.rst | 38 ++++++++++---------------------- docs/manpages/virtvzd.rst | 37 +++++++++---------------------- docs/manpages/virtxend.rst | 37 +++++++++---------------------- 11 files changed, 122 insertions(+), 202 deletions(-) diff --git a/docs/manpages/virtinterfaced.rst b/docs/manpages/virtinterfaced.rst index 5777dba638b0..0d5ac8b489ad 100644 --- a/docs/manpages/virtinterfaced.rst +++ b/docs/manpages/virtinterfaced.rst @@ -39,26 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtinterfaced`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in +Socket activation mode +------------------------ + +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtinterfaced.conf`` will no longer have any effect. -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: -:: +Traditional service mode +------------------------ - $ systemctl mask virtinterfaced.socket virtinterfaced-ro.socket \ - virtinterfaced-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtlxcd.rst b/docs/manpages/virtlxcd.rst index aebc8adb5822..704e30dfea3e 100644 --- a/docs/manpages/virtlxcd.rst +++ b/docs/manpages/virtlxcd.rst @@ -39,40 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtlxcd`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in -``/etc/libvirt/virtlxcd.conf`` will no longer have any effect. - -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: - -:: +Socket activation mode +------------------------ - $ systemctl mask virtlxcd.socket virtlxcd-ro.socket \ - virtlxcd-admin.socket +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtlxcd.conf`` will no longer have any effect. -If using libvirt-guests service then the ordering for that service needs to be -adapted so that it is ordered after the service unit instead of the socket unit. -Since dependencies and ordering cannot be changed with drop-in overrides, the -whole libvirt-guests unit file needs to be changed. In order to preserve such -change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to -``/etc/systemd/system/libvirt-guests.service`` and make the change there, -specifically make sure the ``After=`` ordering mentions ``virtlxcd.service`` and -not ``virtlxcd.socket``: -:: +Traditional service mode +------------------------ - [Unit] - After=virtlxcd.service +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtnetworkd.rst b/docs/manpages/virtnetworkd.rst index 6d9c5e5fa371..22bbd97dcd14 100644 --- a/docs/manpages/virtnetworkd.rst +++ b/docs/manpages/virtnetworkd.rst @@ -39,26 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtnetworkd`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in +Socket activation mode +------------------------ + +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtnetworkd.conf`` will no longer have any effect. -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: -:: +Traditional service mode +------------------------ - $ systemctl mask virtnetworkd.socket virtnetworkd-ro.socket \ - virtnetworkd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtnodedevd.rst b/docs/manpages/virtnodedevd.rst index ef968e486e93..8b751ec730ac 100644 --- a/docs/manpages/virtnodedevd.rst +++ b/docs/manpages/virtnodedevd.rst @@ -38,26 +38,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtnodedevd`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in +Socket activation mode +------------------------ + +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtnodedevd.conf`` will no longer have any effect. -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: -:: +Traditional service mode +------------------------ - $ systemctl mask virtnodedevd.socket virtnodedevd-ro.socket \ - virtnodedevd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtnwfilterd.rst b/docs/manpages/virtnwfilterd.rst index 4faa6b225d17..b09e551958d0 100644 --- a/docs/manpages/virtnwfilterd.rst +++ b/docs/manpages/virtnwfilterd.rst @@ -39,26 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtnwfilterd`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in +Socket activation mode +------------------------ + +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtnwfilterd.conf`` will no longer have any effect. -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: -:: +Traditional service mode +------------------------ - $ systemctl mask virtnwfilterd.socket virtnwfilterd-ro.socket \ - virtnwfilterd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtqemud.rst b/docs/manpages/virtqemud.rst index fa9a6ce3755c..cbd70e0cb74c 100644 --- a/docs/manpages/virtqemud.rst +++ b/docs/manpages/virtqemud.rst @@ -39,40 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtqemud`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in -``/etc/libvirt/virtqemud.conf`` will no longer have any effect. - -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: - -:: +Socket activation mode +------------------------ - $ systemctl mask virtqemud.socket virtqemud-ro.socket \ - virtqemud-admin.socket +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtqemud.conf`` will no longer have any effect. -If using libvirt-guests service then the ordering for that service needs to be -adapted so that it is ordered after the service unit instead of the socket unit. -Since dependencies and ordering cannot be changed with drop-in overrides, the -whole libvirt-guests unit file needs to be changed. In order to preserve such -change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to -``/etc/systemd/system/libvirt-guests.service`` and make the change there, -specifically make sure the ``After=`` ordering mentions ``virtqemud.service`` and -not ``virtqemud.socket``: -:: +Traditional service mode +------------------------ - [Unit] - After=virtqemud.service +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtsecretd.rst b/docs/manpages/virtsecretd.rst index fffb3a24f615..9242bbb18f4e 100644 --- a/docs/manpages/virtsecretd.rst +++ b/docs/manpages/virtsecretd.rst @@ -38,26 +38,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtsecretd`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in +Socket activation mode +------------------------ + +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtsecretd.conf`` will no longer have any effect. -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: -:: +Traditional service mode +------------------------ - $ systemctl mask virtsecretd.socket virtsecretd-ro.socket \ - virtsecretd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtstoraged.rst b/docs/manpages/virtstoraged.rst index 4ceae57e406a..5f6da87f2124 100644 --- a/docs/manpages/virtstoraged.rst +++ b/docs/manpages/virtstoraged.rst @@ -39,26 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtstoraged`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in +Socket activation mode +------------------------ + +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtstoraged.conf`` will no longer have any effect. -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: -:: +Traditional service mode +------------------------ - $ systemctl mask virtstoraged.socket virtstoraged-ro.socket \ - virtstoraged-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtvboxd.rst b/docs/manpages/virtvboxd.rst index f90de3451d8d..bc4d9e22a836 100644 --- a/docs/manpages/virtvboxd.rst +++ b/docs/manpages/virtvboxd.rst @@ -37,40 +37,26 @@ Restarting ``virtvboxd`` does not interrupt running guests. Guests continue to operate and changes in their state will generally be picked up automatically during startup. -SYSTEM SOCKET ACTIVATION -======================== -The ``virtvboxd`` daemon is capable of starting in two modes. +DAEMON STARTUP MODES +==================== -In the traditional mode, it will create and listen on UNIX sockets itself. +The ``virtvboxd`` daemon is capable of starting in two modes. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in -``/etc/libvirt/virtvboxd.conf`` will no longer have any effect. -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: +Socket activation mode +------------------------ -:: - - $ systemctl mask virtvboxd.socket virtvboxd-ro.socket \ - virtvboxd-admin.socket +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtvboxd.conf`` will no longer have any effect. -If using libvirt-guests service then the ordering for that service needs to be -adapted so that it is ordered after the service unit instead of the socket unit. -Since dependencies and ordering cannot be changed with drop-in overrides, the -whole libvirt-guests unit file needs to be changed. In order to preserve such -change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to -``/etc/systemd/system/libvirt-guests.service`` and make the change there, -specifically make sure the ``After=`` ordering mentions ``virtvboxd.service`` and -not ``virtvboxd.socket``: -:: +Traditional service mode +------------------------ - [Unit] - After=virtvboxd.service +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtvzd.rst b/docs/manpages/virtvzd.rst index 970719aac1d5..6097ddab8d08 100644 --- a/docs/manpages/virtvzd.rst +++ b/docs/manpages/virtvzd.rst @@ -39,40 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtvzd`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in -``/etc/libvirt/virtvzd.conf`` will no longer have any effect. - -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: - -:: +Socket activation mode +------------------------ - $ systemctl mask virtvzd.socket virtvzd-ro.socket \ - virtvzd-admin.socket +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtvzd.conf`` will no longer have any effect. -If using libvirt-guests service then the ordering for that service needs to be -adapted so that it is ordered after the service unit instead of the socket unit. -Since dependencies and ordering cannot be changed with drop-in overrides, the -whole libvirt-guests unit file needs to be changed. In order to preserve such -change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to -``/etc/systemd/system/libvirt-guests.service`` and make the change there, -specifically make sure the ``After=`` ordering mentions ``virtvzd.service`` and -not ``virtvzd.socket``: -:: +Traditional service mode +------------------------ - [Unit] - After=virtvzd.service +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS diff --git a/docs/manpages/virtxend.rst b/docs/manpages/virtxend.rst index cf7685ecc0e6..415e8587ce6f 100644 --- a/docs/manpages/virtxend.rst +++ b/docs/manpages/virtxend.rst @@ -39,40 +39,25 @@ during startup. None the less it is recommended to avoid restarting with running guests whenever practical. -SYSTEM SOCKET ACTIVATION -======================== +DAEMON STARTUP MODES +==================== The ``virtxend`` daemon is capable of starting in two modes. -In the traditional mode, it will create and listen on UNIX sockets itself. -In socket activation mode, it will rely on systemd to create and listen -on the UNIX sockets and pass them as pre-opened file descriptors. In this -mode most of the socket related config options in -``/etc/libvirt/virtxend.conf`` will no longer have any effect. - -Socket activation mode is generally the default when running on a host -OS that uses systemd. To revert to the traditional mode, all the socket -unit files must be masked: - -:: +Socket activation mode +------------------------ - $ systemctl mask virtxend.socket virtxend-ro.socket \ - virtxend-admin.socket +On hosts with systemd it is started in socket activation mode and it will rely +on systemd to create and listen on the UNIX sockets and pass them as pre-opened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtxend.conf`` will no longer have any effect. -If using libvirt-guests service then the ordering for that service needs to be -adapted so that it is ordered after the service unit instead of the socket unit. -Since dependencies and ordering cannot be changed with drop-in overrides, the -whole libvirt-guests unit file needs to be changed. In order to preserve such -change copy the installed ``/usr/lib/systemd/system/libvirt-guests.service`` to -``/etc/systemd/system/libvirt-guests.service`` and make the change there, -specifically make sure the ``After=`` ordering mentions ``virtxend.service`` and -not ``virtxend.socket``: -:: +Traditional service mode +------------------------ - [Unit] - After=virtxend.service +On hosts without systemd, it will create and listen on UNIX sockets itself. OPTIONS -- 2.38.0

On Tue, Oct 18, 2022 at 05:28:07PM +0100, Daniel P. Berrangé wrote: Thanks, I fixed the dashes, added virtproxyd and pushed it, the first patch is no longer needed, I'll drop that one along with the second one (for virtproxyd).