From nobody Sun Feb 8 10:48:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1565277245; cv=none; d=zoho.com; s=zohoarc; b=SDYx+2nXgSBoobH2WBY9NOwmFO2QlGXL5bzJ+wrf5xJtTENGM7JQeuKb2ruxe4Lby0ymdAlJesYBymBOow2x7FQfIhovQQ0eMmC9H7usB7dzuImYLFp7uIm8SdkrubjDUDSE+yPQYRlU0v8QAozZ8z/pTtczJlyqaQuxrj6zDQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565277245; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=MdwttzjtlokBG9EPp7mXkSeod0sMJJo2YWcyOFQ5A/E=; b=QXQVPUfHrH34SJenc8+E2BkJwbaUDQvydtVENM+RJdjeMKEJIkiGu2ImI4qyjwL7Mgvv6jzAFar8aSatyFIm9++3y6wAO5309Q9q+HtCPXyNRp2mX94WRSPDHyXRUtlKUvpDHJivMOwNBc+IfkdgvRN3EkowPas5YWKndP6IAg8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565277245317411.2121799988671; Thu, 8 Aug 2019 08:14:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1981B14AFA6; Thu, 8 Aug 2019 15:14:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF104F6DA; Thu, 8 Aug 2019 15:14:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9C7721802216; Thu, 8 Aug 2019 15:14:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x78FBOZm027452 for ; Thu, 8 Aug 2019 11:11:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 05901100194E; Thu, 8 Aug 2019 15:11:24 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FFBA1001284; Thu, 8 Aug 2019 15:11:19 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 16:10:17 +0100 Message-Id: <20190808151044.11385-16-berrange@redhat.com> In-Reply-To: <20190808151044.11385-1-berrange@redhat.com> References: <20190808151044.11385-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Christophe de Dinechin , Andrea Bolognani Subject: [libvirt] [PATCH v4 15/42] build: don't hardcode /etc in the config related files X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 08 Aug 2019 15:14:04 +0000 (UTC) Substitute in the @sysconfigdir@ value instead of /etc. Reviewed-by: Christophe de Dinechin Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrang=C3=A9 --- src/locking/Makefile.inc.am | 1 + src/locking/virtlockd.service.in | 2 +- src/logging/Makefile.inc.am | 1 + src/logging/virtlogd.service.in | 2 +- src/remote/Makefile.inc.am | 8 ++++++++ src/remote/libvirtd-admin.socket.in | 2 +- src/remote/libvirtd-ro.socket.in | 2 +- src/remote/libvirtd-tcp.socket.in | 2 +- src/remote/libvirtd-tls.socket.in | 2 +- src/remote/libvirtd.aug.in | 4 ++-- src/remote/libvirtd.conf.in | 20 ++++++++++---------- src/remote/libvirtd.service.in | 2 +- src/remote/libvirtd.socket.in | 2 +- src/remote/test_libvirtd.aug.in | 8 ++++---- tools/libvirt-guests.service.in | 2 +- 15 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 161410051c..bc1a05549a 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -258,6 +258,7 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \ virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.sta= tus $(AM_V_GEN)sed \ -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi= ce.in index 3c9d587032..e7f8057c06 100644 --- a/src/locking/virtlockd.service.in +++ b/src/locking/virtlockd.service.in @@ -7,7 +7,7 @@ Documentation=3Dman:virtlockd(8) Documentation=3Dhttps://libvirt.org =20 [Service] -EnvironmentFile=3D-/etc/sysconfig/virtlockd +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlockd ExecStart=3D@sbindir@/virtlockd $VIRTLOCKD_ARGS ExecReload=3D/bin/kill -USR1 $MAINPID # Loosing the locks is a really bad thing that will diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index f0c49330f5..18772fde2f 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -122,6 +122,7 @@ virtlogd.8.in: logging/virtlogd.pod virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]sbindir[@]|$(sbindir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service= .in index 3d9ae36150..daff48e67d 100644 --- a/src/logging/virtlogd.service.in +++ b/src/logging/virtlogd.service.in @@ -7,7 +7,7 @@ Documentation=3Dman:virtlogd(8) Documentation=3Dhttps://libvirt.org =20 [Service] -EnvironmentFile=3D-/etc/sysconfig/virtlogd +EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlogd ExecStart=3D@sbindir@/virtlogd $VIRTLOGD_ARGS ExecReload=3D/bin/kill -USR1 $MAINPID # Loosing the logs is a really bad thing that will diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 9d0adb6d8c..9dc27361fd 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -194,6 +194,7 @@ remote/libvirtd.conf: remote/libvirtd.conf.in $(AM_V_GEN)$(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's|[@]DAEMON_NAME[@]|libvirtd|' \ $< > $@ =20 @@ -209,6 +210,7 @@ remote/libvirtd.aug: remote/libvirtd.aug.in $(AM_V_GEN)$(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's|[@]DAEMON_NAME[@]|libvirtd|' \ -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \ $< > $@ @@ -220,6 +222,7 @@ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \ $(SED) \ -e '/[@]CUT_ENABLE_IP[@]/d' \ -e '/[@]END[@]/d' \ + -e 's|[@]sysconfdir[@]|@sysconfdir@|' \ -e 's|[@]DAEMON_NAME[@]|libvirtd|' \ -e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \ > $@ || rm -f $@ @@ -301,30 +304,35 @@ libvirtd.service: remote/libvirtd.service.in $(top_bu= ilddir)/config.status libvirtd.socket: remote/libvirtd.socket.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 libvirtd-ro.socket: remote/libvirtd-ro.socket.in $(top_builddir)/config.st= atus $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 libvirtd-admin.socket: remote/libvirtd-admin.socket.in $(top_builddir)/con= fig.status $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 libvirtd-tcp.socket: remote/libvirtd-tcp.socket.in $(top_builddir)/config.= status $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 libvirtd-tls.socket: remote/libvirtd-tls.socket.in $(top_builddir)/config.= status $(AM_V_GEN)sed \ -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ < $< > $@-t && \ mv $@-t $@ =20 diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi= n.socket.in index 307c9ba24b..bbab4ea355 100644 --- a/src/remote/libvirtd-admin.socket.in +++ b/src/remote/libvirtd-admin.socket.in @@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 [Socket] -# The directory must match the /etc/libvirt/libvirtd.conf unix_sock_dir se= tting +# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc= k_dir setting # when using systemd version < 227 ListenStream=3D@localstatedir@/run/libvirt/libvirt-admin-sock Service=3Dlibvirtd.service diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock= et.in index 876daf0c9c..5f8b1892d5 100644 --- a/src/remote/libvirtd-ro.socket.in +++ b/src/remote/libvirtd-ro.socket.in @@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 [Socket] -# The directory must match the /etc/libvirt/libvirtd.conf unix_sock_dir se= tting +# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc= k_dir setting # when using systemd version < 227 ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock-ro Service=3Dlibvirtd.service diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so= cket.in index 16a4764283..1103036c45 100644 --- a/src/remote/libvirtd-tcp.socket.in +++ b/src/remote/libvirtd-tcp.socket.in @@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 [Socket] -# This must match the /etc/libvirt/libvirtd.conf tcp_port setting +# This must match the @sysconfdir@/libvirt/libvirtd.conf tcp_port setting # when using systemd version < 227 ListenStream=3D16509 Service=3Dlibvirtd.service diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so= cket.in index e904583cf9..e2b1f839de 100644 --- a/src/remote/libvirtd-tls.socket.in +++ b/src/remote/libvirtd-tls.socket.in @@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket After=3Dlibvirtd.socket =20 [Socket] -# This must match the /etc/libvirt/libvirtd.conf tls_port setting +# This must match the @sysconfdir@/libvirt/libvirtd.conf tls_port setting # when using systemd version < 227 ListenStream=3D16514 Service=3Dlibvirtd.service diff --git a/src/remote/libvirtd.aug.in b/src/remote/libvirtd.aug.in index eec3433f29..23a01c41e2 100644 --- a/src/remote/libvirtd.aug.in +++ b/src/remote/libvirtd.aug.in @@ -1,4 +1,4 @@ -(* /etc/libvirt/@DAEMON_NAME@.conf *) +(* @sysconfdir@/libvirt/@DAEMON_NAME@.conf *) =20 module @DAEMON_NAME_UC@ =3D autoload xfm @@ -114,7 +114,7 @@ module @DAEMON_NAME_UC@ =3D =20 let lns =3D ( record | comment | empty ) * =20 - let filter =3D incl "/etc/libvirt/@DAEMON_NAME@.conf" + let filter =3D incl "@sysconfdir@/libvirt/@DAEMON_NAME@.conf" . Util.stdexcl =20 let xfm =3D transform lns filter diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in index e351a8c190..a0fb634607 100644 --- a/src/remote/libvirtd.conf.in +++ b/src/remote/libvirtd.conf.in @@ -134,7 +134,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then -# controlled from /etc/sasl2/libvirt.conf. For the TCP +# controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # @@ -166,7 +166,7 @@ # If you don't enable SASL, then all TCP traffic is cleartext. # Don't do this outside of a dev/test scenario. For real world # use, always enable SASL and use the GSSAPI or DIGEST-MD5 -# mechanism in /etc/sasl2/libvirt.conf +# mechanism in @sysconfdir@/sasl2/libvirt.conf #auth_tcp =3D "sasl" =20 # Change the authentication scheme for TLS sockets. @@ -199,10 +199,10 @@ # Use of TLS requires that x509 certificates be issued. The default locati= ons # for the certificate files is as follows: # -# /etc/pki/CA/cacert.pem - The CA master certificate -# /etc/pki/libvirt/servercert.pem - The server certificate signed= with -# the cacert.pem -# /etc/pki/libvirt/private/serverkey.pem - The server private key +# @sysconfdir@/pki/CA/cacert.pem - The CA master certificate +# @sysconfdir@/pki/libvirt/servercert.pem - The server certificate signe= d with +# the cacert.pem +# @sysconfdir@/pki/libvirt/private/serverkey.pem - The server private key # # It is possible to override the default locations by altering the 'key_fi= le', # 'cert_file', and 'ca_file' values and uncommenting them below. @@ -213,20 +213,20 @@ =20 # Override the default server key file path # -#key_file =3D "/etc/pki/libvirt/private/serverkey.pem" +#key_file =3D "@sysconfdir@/pki/libvirt/private/serverkey.pem" =20 # Override the default server certificate file path # -#cert_file =3D "/etc/pki/libvirt/servercert.pem" +#cert_file =3D "@sysconfdir@/pki/libvirt/servercert.pem" =20 # Override the default CA certificate path # -#ca_file =3D "/etc/pki/CA/cacert.pem" +#ca_file =3D "@sysconfdir@/pki/CA/cacert.pem" =20 # Specify a certificate revocation list. # # Defaults to not using a CRL, uncomment to enable it -#crl_file =3D "/etc/pki/CA/crl.pem" +#crl_file =3D "@sysconfdir@/pki/CA/crl.pem" =20 =20 =20 diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 5dbe7cbe72..4c5b28b478 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -22,7 +22,7 @@ Documentation=3Dhttps://libvirt.org =20 [Service] Type=3Dnotify -EnvironmentFile=3D-/etc/sysconfig/libvirtd +EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirtd # libvirtd.service is set to run on boot so that autostart of # VMs can be performed. We don't want it to stick around if # unused though, so we set a timeout. The socket activation diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in index 2ee4d7d7a2..872f70eb21 100644 --- a/src/remote/libvirtd.socket.in +++ b/src/remote/libvirtd.socket.in @@ -3,7 +3,7 @@ Description=3DLibvirt local socket Before=3Dlibvirtd.service =20 [Socket] -# The directory must match the /etc/libvirt/libvirtd.conf unix_sock_dir se= tting +# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc= k_dir setting # when using systemd version < 227 ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock Service=3Dlibvirtd.service diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug= .in index 2fd809af4a..fc9fb69b67 100644 --- a/src/remote/test_libvirtd.aug.in +++ b/src/remote/test_libvirtd.aug.in @@ -24,10 +24,10 @@ module Test_@DAEMON_NAME@ =3D { "1" =3D "polkit" } } @CUT_ENABLE_IP@ - { "key_file" =3D "/etc/pki/libvirt/private/serverkey.pem" } - { "cert_file" =3D "/etc/pki/libvirt/servercert.pem" } - { "ca_file" =3D "/etc/pki/CA/cacert.pem" } - { "crl_file" =3D "/etc/pki/CA/crl.pem" } + { "key_file" =3D "@sysconfdir@/pki/libvirt/private/serverkey.pem" } + { "cert_file" =3D "@sysconfdir@/pki/libvirt/servercert.pem" } + { "ca_file" =3D "@sysconfdir@/pki/CA/cacert.pem" } + { "crl_file" =3D "@sysconfdir@/pki/CA/crl.pem" } { "tls_no_sanity_certificate" =3D "1" } { "tls_no_verify_certificate" =3D "1" } { "tls_allowed_dn_list" diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service= .in index 491ca62138..10c664016a 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -10,7 +10,7 @@ Documentation=3Dman:libvirtd(8) Documentation=3Dhttps://libvirt.org =20 [Service] -EnvironmentFile=3D-/etc/sysconfig/libvirt-guests +EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirt-guests # Hack just call traditional service until we factor # out the code ExecStart=3D@libexecdir@/libvirt-guests.sh start --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list