On Tue, Oct 18, 2022 at 05:28:07PM +0100, Daniel P. Berrangé wrote:
On Tue, Oct 18, 2022 at 04:37:32PM +0200, Martin Kletzander wrote:
> 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>
> ---
> 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(-)
Also virtproxyd.rst based on my comment to #2
>
> 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
> +------------------------
Nitpick - two too many '-' here (repeated throughout).
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
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).