From nobody Mon Feb 9 19:06:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1666103886; cv=none; d=zohomail.com; s=zohoarc; b=DP5GxY8yVuyEqieWch0SoeoUySk4KEnm82TdK2D42ls+CGAqF4KStRf6u4NQ5MV9Nzlw5XeGEGLKjBHx/X2ZyK+1rIUoXuA6jagEkhBhFM+meQwfqRzmUuQn3C9gJqJ0w8kdM5Ee7+L+gpFUpZocz3eFANiyFfqkbWRejoCPUQg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666103886; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TmGfYkPe6i/OUEuMvfu+naag43q0i/76r/2ALaiZt5s=; b=K+dxzSipgUrEqdLDTY12o91/NwQCvgqIFF5g2M6RFchiY+zN2IMqhcWhHNkm2ebYIl15z2KDv0muUbZg/hog/qsVZSG0ioMy7Jb8zLmVuhNrCyETXZLwvCBfZei6dYhCwzgtXiOmhuD3FU0+Fvzchk7SCE5zs0KaR30+1rD5kwE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1666103886383691.5175037236025; Tue, 18 Oct 2022 07:38:06 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-261-_nsxZYZzPnyQaI5F63gCfQ-1; Tue, 18 Oct 2022 10:37:59 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2E62F3810D2E; Tue, 18 Oct 2022 14:37:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6A0E112132C; Tue, 18 Oct 2022 14:37:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6279219465A8; Tue, 18 Oct 2022 14:37:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 272461946595 for ; Tue, 18 Oct 2022 14:37:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0AB7414C4868; Tue, 18 Oct 2022 14:37:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 02B4414C4860 for ; Tue, 18 Oct 2022 14:37:47 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E1BFA833AF5 for ; Tue, 18 Oct 2022 14:37:46 +0000 (UTC) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-505-frDC1xAQNF6CYxf1Zdwe4w-1; Tue, 18 Oct 2022 10:37:40 -0400 Received: by mail-ed1-f70.google.com with SMTP id b13-20020a056402350d00b0045d0fe2004eso10045296edd.18 for ; Tue, 18 Oct 2022 07:37:40 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id u5-20020a17090617c500b00781be3e7badsm7650796eje.53.2022.10.18.07.37.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 07:37:37 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id D2D4CA5E0D8E for ; Tue, 18 Oct 2022 16:37:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666103885; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TmGfYkPe6i/OUEuMvfu+naag43q0i/76r/2ALaiZt5s=; b=TmZ/oVeUh4A3oZDhUACiNQ0yoBSE4L1J8QJ7A660NcYnIA9QDk52UqiqiAJsW9hEPxPgXZ aE7bvZezJjXj7IoCHjgBbUW2766htXjNEcCHIl6H54cPfpqMXy+exZqH9JfpN7G0RmAH3t 1X+GNG6BmgRp1k7N0iFR1e68UAcj4mk= X-MC-Unique: _nsxZYZzPnyQaI5F63gCfQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: frDC1xAQNF6CYxf1Zdwe4w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TmGfYkPe6i/OUEuMvfu+naag43q0i/76r/2ALaiZt5s=; b=TwpPEBy/7DxScfUBAbw+OWofpJKMlM7y6mC5V+vtWKdx8nom+FZWd/iMWGBBpFarnK Pmj3vGQhTUHtrthQQG39T0GezbcMPzFApZhrcVOApKJY20D5TlwWypH8G1Vxmbb+CV3+ oeikpPeq64w7t2/hvKfq84GcuVz4zezkOL8b2gTUs1iXYgoxIPmOABxNNyV8Ex14h4Q+ 9fqqYQwqfmcTr/1OL9CrVah0ni9c/jD1cJTSMY06OzsHtADTRcRmwQvOd4UreD1tANtQ N9T++8jDdhq103UNS6vShSUd9Gnizcb46mwsB8HzpYCLsVc6KK89yqdyG5Bl9GPya/nj GlDQ== X-Gm-Message-State: ACrzQf0R/kUCDUuuyPVX8o1rBDny2hvgSBlrCIS9x4WqsIdgnLqo8t6K /+FSUomU3/i4+jsnG5Hr0guVkKVGzMPw3+ksl1jtr1pDV44TqVmh7XVIsFauHRvlrG3kiCBw9L2 lk+f3blTarKr9NkMOiMPocPv0Ovw3ev6B276KcWx85SDLx2rJG3m4vwLZOgfP+Dcp3+Joo6k= X-Received: by 2002:a17:907:25cc:b0:77b:a6c7:6d2b with SMTP id ae12-20020a17090725cc00b0077ba6c76d2bmr2754801ejc.148.1666103859005; Tue, 18 Oct 2022 07:37:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4aDZ3w1tyP5CI0j2tD7J3852y2m3pgeQgivH6rJHmO/FRpXdVC/6kyCTvWV730smHYY0uoug== X-Received: by 2002:a17:907:25cc:b0:77b:a6c7:6d2b with SMTP id ae12-20020a17090725cc00b0077ba6c76d2bmr2754767ejc.148.1666103858514; Tue, 18 Oct 2022 07:37:38 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 3/3] docs: Do not support non-socket activated modular daemons with systemd Date: Tue, 18 Oct 2022 16:37:32 +0200 Message-Id: <1eac153ad5981af4f59df8b16bb298b9ef9f55a8.1666103680.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666103887631100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Due to the setup of the modular daemon service files the reverting to non-s= ocket activated daemons could have never worked. The reason is that masking the socket files prevents starting the daemons since they require (as in Requir= es=3D rather than Wants=3D in the service file) the sockets. On top of that it c= reates 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- 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/virtinterface= d.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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtinterfaced`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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-o= pened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtinterfaced.conf`` will no longer have any effect. =20 -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: =20 -:: +Traditional service mode +------------------------ =20 - $ systemctl mask virtinterfaced.socket virtinterfaced-ro.socket \ - virtinterfaced-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtlxcd`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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 +------------------------ =20 - $ 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-o= pened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtlxcd.conf`` will no longer have any effect. =20 -If using libvirt-guests service then the ordering for that service needs t= o 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=3D`` ordering mentions ``virtlxcd.servi= ce`` and -not ``virtlxcd.socket``: =20 -:: +Traditional service mode +------------------------ =20 - [Unit] - After=3Dvirtlxcd.service +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtnetworkd`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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-o= pened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtnetworkd.conf`` will no longer have any effect. =20 -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: =20 -:: +Traditional service mode +------------------------ =20 - $ systemctl mask virtnetworkd.socket virtnetworkd-ro.socket \ - virtnetworkd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtnodedevd`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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-o= pened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtnodedevd.conf`` will no longer have any effect. =20 -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: =20 -:: +Traditional service mode +------------------------ =20 - $ systemctl mask virtnodedevd.socket virtnodedevd-ro.socket \ - virtnodedevd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtnwfilterd`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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-o= pened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtnwfilterd.conf`` will no longer have any effect. =20 -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: =20 -:: +Traditional service mode +------------------------ =20 - $ systemctl mask virtnwfilterd.socket virtnwfilterd-ro.socket \ - virtnwfilterd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtqemud`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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 +------------------------ =20 - $ 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-o= pened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtqemud.conf`` will no longer have any effect. =20 -If using libvirt-guests service then the ordering for that service needs t= o 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=3D`` ordering mentions ``virtqemud.serv= ice`` and -not ``virtqemud.socket``: =20 -:: +Traditional service mode +------------------------ =20 - [Unit] - After=3Dvirtqemud.service +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtsecretd`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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-o= pened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtsecretd.conf`` will no longer have any effect. =20 -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: =20 -:: +Traditional service mode +------------------------ =20 - $ systemctl mask virtsecretd.socket virtsecretd-ro.socket \ - virtsecretd-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtstoraged`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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-o= pened +file descriptors. In this mode most of the socket related config options in ``/etc/libvirt/virtstoraged.conf`` will no longer have any effect. =20 -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: =20 -:: +Traditional service mode +------------------------ =20 - $ systemctl mask virtstoraged.socket virtstoraged-ro.socket \ - virtstoraged-admin.socket +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 gue= sts. Guests continue to operate and changes in their state will generally be picked up automatical= ly during startup. =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -The ``virtvboxd`` daemon is capable of starting in two modes. +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 -In the traditional mode, it will create and listen on UNIX sockets itself. +The ``virtvboxd`` daemon is capable of starting in two modes. =20 -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. =20 -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 +------------------------ =20 -:: - - $ 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-o= pened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtvboxd.conf`` will no longer have any effect. =20 -If using libvirt-guests service then the ordering for that service needs t= o 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=3D`` ordering mentions ``virtvboxd.serv= ice`` and -not ``virtvboxd.socket``: =20 -:: +Traditional service mode +------------------------ =20 - [Unit] - After=3Dvirtvboxd.service +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtvzd`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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 +------------------------ =20 - $ 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-o= pened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtvzd.conf`` will no longer have any effect. =20 -If using libvirt-guests service then the ordering for that service needs t= o 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=3D`` ordering mentions ``virtvzd.servic= e`` and -not ``virtvzd.socket``: =20 -:: +Traditional service mode +------------------------ =20 - [Unit] - After=3Dvirtvzd.service +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 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 avoi= d restarting with running guests whenever practical. =20 =20 -SYSTEM SOCKET ACTIVATION -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +DAEMON STARTUP MODES +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The ``virtxend`` daemon is capable of starting in two modes. =20 -In the traditional mode, it will create and listen on UNIX sockets itself. =20 -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 +------------------------ =20 - $ 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-o= pened +file descriptors. In this mode most of the socket related config options in +``/etc/libvirt/virtxend.conf`` will no longer have any effect. =20 -If using libvirt-guests service then the ordering for that service needs t= o 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=3D`` ordering mentions ``virtxend.servi= ce`` and -not ``virtxend.socket``: =20 -:: +Traditional service mode +------------------------ =20 - [Unit] - After=3Dvirtxend.service +On hosts without systemd, it will create and listen on UNIX sockets itself. =20 =20 OPTIONS --=20 2.38.0