From nobody Wed Apr 15 07:04:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1775472903; cv=none; d=zohomail.com; s=zohoarc; b=OxRjAcUHGLnEIFio8DMci1WZeceO+Ps8Y9K8vYBeBgIatlkjmfVISSt5TkrWDlXJB4wc2L7kADcEPqazwOzYi2/T4tdmLquXIaKzBQf32m86zSPtWwKHUtgFpt7qpLWyq63OEHx87StImPvO8woifmr08o9N8qaESNh9fuG0lnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775472903; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=7lsbjfLWIpJRDmxwQ+y+J5iNt6nE6hUqursTR0PBCH0=; b=mEr2YaZLM8e1n6ZEKHi1ngeUA0xlvXWczoqDLFF3rI4zrQgYMHw1FEcGoF61jZtApmHz1onXgkAN1LZbpK/yKai6nnLIBMDPFogEiQC3+dnzPOy6NqrglxQUzR+hU8K0K7ab6H+krzU4+OqvFF1ArWaD6VwTvaZgS3/zQSk0fHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 177547290373489.61852085228259; Mon, 6 Apr 2026 03:55:03 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id D646741852; Mon, 6 Apr 2026 06:55:02 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5FD1F4190F; Mon, 6 Apr 2026 06:53:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B321C3F2F7; Mon, 6 Apr 2026 06:53:36 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 57DD43F311 for ; Mon, 6 Apr 2026 06:53:36 -0400 (EDT) Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-5-k0pmdEMgOrOE4hmj8iFXmA-1; Mon, 06 Apr 2026 06:53:34 -0400 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2b23c909256so56592925ad.0 for ; Mon, 06 Apr 2026 03:53:34 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.104.232]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749b66aasm141864425ad.68.2026.04.06.03.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 03:53:32 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775472816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7lsbjfLWIpJRDmxwQ+y+J5iNt6nE6hUqursTR0PBCH0=; b=P6wQUTFqyApqyM+hg2jiyErPyXbz7UGxKWJu0DN/ze/Ys1Tz12UKk/G6/ZNEhfl8ejUlZu Xd3kyhvHVhqEJIpMQL8T4p/wCEgeLIVkknyvaNvkzhOV8nC0GaeYIw2golJB27V9XiFIGt f3eC2EjVyKNmlmJnptZJOui31PNve/o= X-MC-Unique: k0pmdEMgOrOE4hmj8iFXmA-1 X-Mimecast-MFC-AGG-ID: k0pmdEMgOrOE4hmj8iFXmA_1775472814 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775472813; x=1776077613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7lsbjfLWIpJRDmxwQ+y+J5iNt6nE6hUqursTR0PBCH0=; b=bhVOTO5mh0wj0vBtSMjPUpQEMA2lVD7i7nW6KGWiXpnx7FLBAay/MKKbnV7qB+/vBE zOa5Gj1f5/kl0y68nXYK6Hged5fR/Qe21sgds8gQF7Cjj+5Qhm2eTdPN3yYTkG8hRVE/ FqP2K3HOoY2BTt1IHJ5tW0xbzgFGIGLy2v/tnF0Im8k0bwfSUufAYO5mgW4o5JjjtPz6 V/cAzZPyFv1JOCJ08VBOtBxXE5vbA6MD0n4ovgp6zwkXm5OTxiQKp8VfnLZrKl7qR/Fc O5JO6svAGE10Z5sgx49yCTaz2HRFr7sj4w0QP1ZMdlS+v34AGD6Pn/uFZmZ3J45rZrmR lo9g== X-Gm-Message-State: AOJu0YxLiYTfC/EL1ywdj46Zx7IVARdsLMu5VYiVwG0z6/eYAXtVJ/2z nlqOxI0m3/5YxYdmctIKgrBoJvJGFv9KsVAaVfESku93TE2bV/BFTLae7ZBM3eGOnCXhMGjv4gn 3/8zdpjavH0jTOw2jby6gjrWVlJDZPPyXqfDQbqjLJuQ4r8iZxOIeySWH2vnm9JnC0CCLB9/TNJ E0BvkBhv8n12W0B+3WKNwBbZDr1fYTdZxq8uDkcRkALw== X-Gm-Gg: AeBDietfmlB/S9TjPtJ32dgLlTuZAGl0Qps2sGPP6SJrVsdT84AmF0Hw7+HjlKjaoOV IvB8O1ZLe065vToMRU1aEQHnmASLeDZSxwX02F5Lc1PmO4tVrPBVBOXeJD9dk45J0SRA5VRDf3P hMNeb4EgPQStJVd6Gfp48wDgIsWySy3PQBxeoOuuBN2bvdpzgcaKXoEC3VfQGhdP2W3B0JC3YUb 4nnWNaxzvdHjJjsau1HSHkvP4vCXeUAle37N4dzrfGiuThQRH7UFoxzokmozZz7/5o0NlLE0dJy N6MAkCWIo87z4E9nUim15Z58cvNMYW2x3UdR8JGEjdT732UGq1NLdVnOY9vty2l2bR26xX7Szal KvD7KKXpvdGe4eGBI8q9ivHdsarnI0sdjMBkz1rlmzAXRwPgA8KM8xOlfrBW258c= X-Received: by 2002:a17:903:2f08:b0:2b0:6365:21a9 with SMTP id d9443c01a7336-2b281789ec2mr131946605ad.31.1775472813466; Mon, 06 Apr 2026 03:53:33 -0700 (PDT) X-Received: by 2002:a17:903:2f08:b0:2b0:6365:21a9 with SMTP id d9443c01a7336-2b281789ec2mr131946325ad.31.1775472812810; Mon, 06 Apr 2026 03:53:32 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH v2 1/2] remote: Move secrets encryption dependency to a systemd drop-in Date: Mon, 6 Apr 2026 16:23:25 +0530 Message-ID: <20260406105326.32542-2-armenon@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260406105326.32542-1-armenon@redhat.com> References: <20260406105326.32542-1-armenon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xF5_C9esZBQBN3In6JM551iN-WwGHF9WZ9_N5oAybVg_1775472814 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NM4ZXZXBH7PYFCPHX6XCEZM7ZFZM36ZP X-Message-ID-Hash: NM4ZXZXBH7PYFCPHX6XCEZM7ZFZM36ZP X-MailFrom: armenon@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Arun Menon X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Arun Menon via Devel Reply-To: Arun Menon X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775472914530158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Arun Menon The monolithic libvirtd.service currently has a dependency on virt-secret-init-encryption.service. This causes libvirtd to fail to start on systems where the secret driver is not installed or enabled, as systemd cannot satisfy the Requires=3D unit or the LoadCredentialEncrypted=3D path. See below, Requires=3Dvirt-secret-init-encryption.service LoadCredentialEncrypted=3Dsecrets-encryption-key:@localstatedir@/lib/libvir= t/secrets/secrets-encryption-key This patch decouples the secrets encryption logic from the main libvirtd service file. It is moved into a new systemd drop-in (10-secret.conf) which is only installed when libvirt is built with secret driver support. The override snippet is added to the daemon-driver-secret package. Fixes: 97758bc9a0b1fccf8c0009308658f1204b113b89 Signed-off-by: Arun Menon Fix-Suggested-by: Andrea Bolognani --- libvirt.spec.in | 2 ++ src/remote/libvirtd.service.in | 4 ---- src/remote/meson.build | 15 +++++++++++++++ src/remote/secret.conf.in | 7 +++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/remote/secret.conf.in diff --git a/libvirt.spec.in b/libvirt.spec.in index 00316a03f2..2fddfcd606 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2259,6 +2259,8 @@ exit 0 %{_unitdir}/virtsecretd.socket %{_unitdir}/virtsecretd-ro.socket %{_unitdir}/virtsecretd-admin.socket +%dir %attr(0755, root, root) %{_unitdir}/libvirtd.service.d/ +%{_unitdir}/libvirtd.service.d/10-secret.conf %attr(0755, root, root) %{_sbindir}/virtsecretd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/secrets/ diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 7965010a0a..b0a062e885 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -12,8 +12,6 @@ After=3Dlibvirtd.socket After=3Dlibvirtd-ro.socket After=3Dlibvirtd-admin.socket Requires=3Dvirtlogd.socket -Requires=3Dvirt-secret-init-encryption.service -After=3Dvirt-secret-init-encryption.service Wants=3Dvirtlockd.socket After=3Dvirtlogd.socket After=3Dvirtlockd.socket @@ -31,8 +29,6 @@ Conflicts=3Dxendomains.service Type=3Dnotify-reload Environment=3DLIBVIRTD_ARGS=3D"--timeout 120" EnvironmentFile=3D-@initconfdir@/libvirtd -Environment=3DSECRETS_ENCRYPTION_KEY=3D%d/secrets-encryption-key -LoadCredentialEncrypted=3Dsecrets-encryption-key:@localstatedir@/lib/libvi= rt/secrets/secrets-encryption-key ExecStart=3D@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=3D/bin/kill -HUP $MAINPID KillMode=3Dprocess diff --git a/src/remote/meson.build b/src/remote/meson.build index e503263266..7c53e4a54f 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -343,4 +343,19 @@ if conf.has('WITH_SASL') ) endif =20 +# The monolithic libvirt daemon only attempts to load the +# secrets encryption credentials if the secret driver is enabled +if conf.has('WITH_SECRETS') + secret_dropin_conf =3D configuration_data({ + 'localstatedir': localstatedir, + }) + + configure_file( + input: 'secret.conf.in', + output: '10-secret.conf', + configuration: secret_dropin_conf, + install_dir: unitdir / 'libvirtd.service.d' + ) +endif + remote_inc_dir =3D include_directories('.') diff --git a/src/remote/secret.conf.in b/src/remote/secret.conf.in new file mode 100644 index 0000000000..a718b44be9 --- /dev/null +++ b/src/remote/secret.conf.in @@ -0,0 +1,7 @@ +[Unit] +Requires=3Dvirt-secret-init-encryption.service +After=3Dvirt-secret-init-encryption.service + +[Service] +Environment=3DSECRETS_ENCRYPTION_KEY=3D%d/secrets-encryption-key +LoadCredentialEncrypted=3Dsecrets-encryption-key:@localstatedir@/lib/libvi= rt/secrets/secrets-encryption-key --=20 2.53.0 From nobody Wed Apr 15 07:04:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1775472936; cv=none; d=zohomail.com; s=zohoarc; b=ivKujXnMjUcPARbV3NmtDh9tlF+kgAWEMLEMdk8Iquk/sPJmApQWIldV4o0WRiVWtIAmoB/L5R245Gzd1dfRQsJM2MBwA1wUPV35Vc5Wu4sk6wD+ESD6l1Q+Q+a1MzsDKoFZ1f/7mFF8Z00ntrrgkSU4WMw9apc6ZuePsXIwZls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775472936; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=HeegQP8llQUAN9UP4yWTBlmqSZqtvZyDs4wTJwwsbCw=; b=Y++/F3rfhQyz6Zw3BGfZ66ObuYnGsq5OlkrHdhcGXmQp+BHFPXVc934SwvTvlkC6ZPC8VsWlwdZrsoVn2JDeh/tBH+8dQM6A2Gv1E+UaCzqsgyJIX2rBKPLcfwL2P02/ZUCLTiZLajQyGfsmnyFpynDqwrez8IADeJtp4dfHIKk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1775472936098674.2665182031227; Mon, 6 Apr 2026 03:55:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 31E413F943; Mon, 6 Apr 2026 06:55:35 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0570F41979; Mon, 6 Apr 2026 06:53:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7ED4B3F83E; Mon, 6 Apr 2026 06:53:38 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id DB8043F311 for ; Mon, 6 Apr 2026 06:53:37 -0400 (EDT) Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-682-fw5fyyy4PB2QkSVr7jC7gw-1; Mon, 06 Apr 2026 06:53:36 -0400 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2b0f4e632caso58627935ad.3 for ; Mon, 06 Apr 2026 03:53:36 -0700 (PDT) Received: from fedora.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.104.232]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b2749b66aasm141864425ad.68.2026.04.06.03.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 03:53:34 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1775472817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HeegQP8llQUAN9UP4yWTBlmqSZqtvZyDs4wTJwwsbCw=; b=dLxm8lKSid7K1nF/KNvvq+NaBjtTEnCQw7YCXvgYbYkHFi7SMW6ElR8SqUQJ/u9xo5BrSt Lig/2/6MP+ev6SqjUnSMRB63IwGJM9hD1KvjLaI+AlX810jAYSs3XAl0hrM9xdUwapJPaD NMfZtq4P2YKz4tIri7hoIZkpMitsziY= X-MC-Unique: fw5fyyy4PB2QkSVr7jC7gw-1 X-Mimecast-MFC-AGG-ID: fw5fyyy4PB2QkSVr7jC7gw_1775472816 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775472815; x=1776077615; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HeegQP8llQUAN9UP4yWTBlmqSZqtvZyDs4wTJwwsbCw=; b=qIzQxGTwo2oJSHKt40cc5jmAEWhJ9ZTedu4KQRbfl53pFOwu+GiLnKe6IwXPOR844D u/dybTw41QcEjkYjYx7YRI9GAP91PU37aBlRV+pnt2nGM7ACAwbw8jx18TXTylAjBsoP d7AbbbowRbmQaveOVJSFL5DIgaG+bjrjjw93OV6AxrdaXvlnwLhe1llUhBsspwosbrE0 DznVvQH/FuXX1crjKrJN2DBmFZTkTQpO3TKhBQ4yBngpNh+aZswOmIZC7AYSLcjZWURq rrsG1gAQxpEF+HBhWZRp9t/EJj92h9LoCPM2FIXzkGQxg4lKFFEkKLDRJVDBbJGumR2D Y8yQ== X-Gm-Message-State: AOJu0Yw1jB/HXiRw/o4shqaV6E29t7eh6i5+hdRXq+FONIxdUS1B7gXR kq9ZEGARZd3Pet7ledC+C6e7mB9v6PMWoWVVZU4orELBRNoXyZQtPRNuHot9TfeIIhRAZBwTWtW Et2S8pynplPXcvaKgVOrn8NjdYzdhdLSOIA3tlfdwCjECV+4BEUmWXJrqu+2n1oxWVRm4vn8sDm 1bYZ1nNvUErCBXiVcSsf7pa1CnKLgjqUUKQU2k7uM8Xw== X-Gm-Gg: AeBDieudxRwgVsl0RGvrEoAep22o22VdNsFXpqQg3SbT4m/KfedJFi4jwNjqD4YTjM/ XAl2/xTQiRy7Gev/rgUVp+wgvESgJPVv1jetaqxt7tctGnLr4LadqNazWDPscYctcvbGFONifiX 8M6OzyDoHd5/DL02s412GCFaaVM6n1+IanN/0J43KI6ZS51yKqeyv6x21tHIIZEkgbwgXT8V2bq 5NuiN/bSyQNps7/PgrthjGUgQ10/cXz3DzLeSpq86Z5xcdt72EzQYPI7nwYJ1sVVmjqrYCr1Vpk RXzdb9pzrN+rw9HWH2RnfRqxIxvvbu5gjVU1IuZvsPd9b+h8zwJXHV4uLhgwXBjglqkkl1+G4HP 853J+aTKG2gyr6fU/Fp2RH3YuBHIQWeTOpPLxp5lKxKQKf5X6GBBNGyg1Xp72suY= X-Received: by 2002:a17:903:38d0:b0:2ae:6457:3099 with SMTP id d9443c01a7336-2b281833d73mr127374705ad.26.1775472815021; Mon, 06 Apr 2026 03:53:35 -0700 (PDT) X-Received: by 2002:a17:903:38d0:b0:2ae:6457:3099 with SMTP id d9443c01a7336-2b281833d73mr127374345ad.26.1775472814460; Mon, 06 Apr 2026 03:53:34 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH v2 2/2] secret: Update virt_secret_init_encryption_conf initialization Date: Mon, 6 Apr 2026 16:23:26 +0530 Message-ID: <20260406105326.32542-3-armenon@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260406105326.32542-1-armenon@redhat.com> References: <20260406105326.32542-1-armenon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: z1efHLDWsuEbmqq_qGwQMQZmOOrZHgZ8_yILnRtgd0E_1775472816 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5NP3D2ZJ4KUSGIEH6L5ODEVASJALZQQC X-Message-ID-Hash: 5NP3D2ZJ4KUSGIEH6L5ODEVASJALZQQC X-MailFrom: armenon@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Arun Menon X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Arun Menon via Devel Reply-To: Arun Menon X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1775472942516158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Arun Menon Refactor the configuration data setup to pass the localstatedir variable directly during initialization. No functional change intended. Signed-off-by: Arun Menon --- src/secret/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/secret/meson.build b/src/secret/meson.build index 32105dad9f..e7b1ad9045 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -50,9 +50,9 @@ if conf.has('WITH_SECRETS') 'name': 'virtsecretd', } =20 - virt_secret_init_encryption_conf =3D configuration_data() - - virt_secret_init_encryption_conf.set('localstatedir', localstatedir) + virt_secret_init_encryption_conf =3D configuration_data({ + 'localstatedir': localstatedir, + }) =20 if init_script =3D=3D 'systemd' configure_file( --=20 2.53.0