meson: Use initconfdir

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/docs/manpages/libvirt-guests.rst b/docs/manpages/libvirt-guests.rst
index bea08e3bfff6bf23fbc48bd3b9584467b4633598..f27eaad6e4025116358fcbc1b941a23f86a36b0e 100644 (file)
--- a/docs/manpages/libvirt-guests.rst
+++ b/docs/manpages/libvirt-guests.rst
@@ -42,7 +42,7 @@ FILES
 ``libvirt-guests`` defines several variables to control service behavior.
 The default value of these variables can be overridden in:
 
-* ``@SYSCONFDIR@/sysconfig/libvirt-guests``
+* ``@INITCONFDIR@/libvirt-guests``
 
 The following variables are supported:
 

diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
index afcadaefbd40c4d97a0e14c17eef68a05cedc108..bdc17011a890dde93152dafcb7be98fd9e4f05d6 100644 (file)
--- a/docs/manpages/meson.build
+++ b/docs/manpages/meson.build
@@ -88,6 +88,7 @@ endforeach
 docs_man_conf = configuration_data({
   'SYSCONFDIR': sysconfdir,
   'RUNSTATEDIR': runstatedir,
+  'INITCONFDIR': initconfdir,
   'VERSION': meson.project_version(),
 })
 

diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in
index 8c22b02c9e709b8c2d56cf352c8185f3a3e895c2..a07c04a84529430e2c0f5be193df0b6f92f5b061 100644 (file)
--- a/src/ch/virtchd.service.in
+++ b/src/ch/virtchd.service.in
@@ -18,7 +18,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTCHD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtchd
+EnvironmentFile=-@initconfdir@/virtchd
 ExecStart=@sbindir@/virtchd $VIRTCHD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process

diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in
index cb860ff1c481d0976a3f01a1b4f83156c54b0449..1be3ab32dc862093b521ee56083da69e677d84aa 100644 (file)
--- a/src/interface/virtinterfaced.service.in
+++ b/src/interface/virtinterfaced.service.in
@@ -14,7 +14,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTINTERFACED_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
+EnvironmentFile=-@initconfdir@/virtinterfaced
 ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
index 9171d4fdf833581f6bc88be9be6ba8a1ddeb7138..abb1972777d237a921229ed2d0883aba457b9c99 100644 (file)
--- a/src/libxl/virtxend.service.in
+++ b/src/libxl/virtxend.service.in
@@ -19,7 +19,7 @@ ConditionPathExists=/proc/xen/capabilities
 [Service]
 Type=notify
 Environment=VIRTXEND_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
+EnvironmentFile=-@initconfdir@/virtxend
 ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 19271d1e7d4b2389c15be4785c712d6eaf15c457..23054369d5a98e8d5879eca599986dd096e4a1d1 100644 (file)
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -8,7 +8,7 @@ Documentation=https://libvirt.org
 
 [Service]
 Environment=VIRTLOCKD_ARGS=
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
+EnvironmentFile=-@initconfdir@/virtlockd
 ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
 ExecReload=/bin/kill -USR1 $MAINPID
 # Losing the locks is a really bad thing that will

diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 8ab547851772298ff570487f1ce2d3680c7e4d68..158124e4d3d11d50ecbb5666dc69209856a9adbe 100644 (file)
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -7,7 +7,7 @@ Documentation=man:virtlogd(8)
 Documentation=https://libvirt.org
 
 [Service]
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
+EnvironmentFile=-@initconfdir@/virtlogd
 ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
 ExecReload=/bin/kill -USR1 $MAINPID
 # Losing the logs is a really bad thing that will

diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
index 9946db9462198bf9c71b401429c140d2de34373d..2623f7375ac68e43cc36b9823f8b781352c91436 100644 (file)
--- a/src/lxc/virtlxcd.service.in
+++ b/src/lxc/virtlxcd.service.in
@@ -18,7 +18,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTLXCD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
+EnvironmentFile=-@initconfdir@/virtlxcd
 ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process

diff --git a/src/meson.build b/src/meson.build
index ad7796f03d1c45a6de20ca8dcde61d86cb9514ba..c2b882d464b1148ec702803cb086157c1a3fa656 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -808,6 +808,7 @@ if conf.has('WITH_LIBVIRTD')
         'runstatedir': runstatedir,
         'sbindir': sbindir,
         'sysconfdir': sysconfdir,
+        'initconfdir': initconfdir,
         'name': unit['name'],
         'service': unit['service'],
         'sockprefix': unit['sockprefix'],

diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
index 05ce672b73e8bf0290df0843a029addef16673d0..48423e777dbec57bf98fa790524bef65226a39a1 100644 (file)
--- a/src/network/virtnetworkd.service.in
+++ b/src/network/virtnetworkd.service.in
@@ -17,7 +17,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTNETWORKD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
+EnvironmentFile=-@initconfdir@/virtnetworkd
 ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in
index cd9de362fdb0923c7df7aa69091f6431e5a092e0..3ceed30f299c2c5184aba40aab27dff9e3971485 100644 (file)
--- a/src/node_device/virtnodedevd.service.in
+++ b/src/node_device/virtnodedevd.service.in
@@ -14,7 +14,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTNODEDEVD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
+EnvironmentFile=-@initconfdir@/virtnodedevd
 ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in
index ab65419e0c98950ab28699efac42e87e6e04baf0..37fa54d684f752554c8f166aa1c230173c3e9c35 100644 (file)
--- a/src/nwfilter/virtnwfilterd.service.in
+++ b/src/nwfilter/virtnwfilterd.service.in
@@ -14,7 +14,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTNWFILTERD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
+EnvironmentFile=-@initconfdir@/virtnwfilterd
 ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
index 315359e2876b15e8b68b9c0b46fdabf0cd16137d..032cbcbbf05398ca86199cddbbd9df72bcfab42c 100644 (file)
--- a/src/qemu/virtqemud.service.in
+++ b/src/qemu/virtqemud.service.in
@@ -20,7 +20,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTQEMUD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
+EnvironmentFile=-@initconfdir@/virtqemud
 ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process

diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 30588279f89187464eaf6ebe9d1052c94fd7e851..11507207a1ebbaf329257344e6ad11b1522f38b3 100644 (file)
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -28,7 +28,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=LIBVIRTD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
+EnvironmentFile=-@initconfdir@/libvirtd
 ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process

diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in
index f9bb6b84a97a67d30a2c2fc86d5e27a9994cb389..dd3bdf34291c77ab14547dedb0bc714392a02b0a 100644 (file)
--- a/src/remote/virtproxyd.service.in
+++ b/src/remote/virtproxyd.service.in
@@ -14,7 +14,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTPROXYD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
+EnvironmentFile=-@initconfdir@/virtproxyd
 ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in
index 6d298c5334a1cc011be4f1edf1cc6c0217f89984..774cfc3ecdce2da9ebbec71c772b0b1f6965d57a 100644 (file)
--- a/src/secret/virtsecretd.service.in
+++ b/src/secret/virtsecretd.service.in
@@ -14,7 +14,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTSECRETD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
+EnvironmentFile=-@initconfdir@/virtsecretd
 ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in
index eda4d86d37c055666c5c9dcee9ffc9d1adf2ec6c..e1a1ea6820581840ab938d4f00769e14c997392c 100644 (file)
--- a/src/storage/virtstoraged.service.in
+++ b/src/storage/virtstoraged.service.in
@@ -16,7 +16,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTSTORAGED_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
+EnvironmentFile=-@initconfdir@/virtstoraged
 ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in
index 6f447276e90ea4d66231536d3839fd2600c95476..e73206591acb1b5ce18fb84c6eefef74393f9755 100644 (file)
--- a/src/vbox/virtvboxd.service.in
+++ b/src/vbox/virtvboxd.service.in
@@ -15,7 +15,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTVBOXD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
+EnvironmentFile=-@initconfdir@/virtvboxd
 ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in
index 2b1165c92bf3bed11ceab4c7b573f02475ba61a2..bd98d962620d198ff0c581dd7a3758251c0aa486 100644 (file)
--- a/src/vz/virtvzd.service.in
+++ b/src/vz/virtvzd.service.in
@@ -15,7 +15,7 @@ Documentation=https://libvirt.org
 [Service]
 Type=notify
 Environment=VIRTVZD_ARGS="--timeout 120"
-EnvironmentFile=-@sysconfdir@/sysconfig/virtvzd
+EnvironmentFile=-@initconfdir@/virtvzd
 ExecStart=@sbindir@/virtvzd $VIRTVZD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure

diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
index 1c569c320dfdf9351e1345d9a9af9bb1be8d2fb1..c547218f2afee1834a889c068e7355a0f764922e 100644 (file)
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -14,7 +14,7 @@ Documentation=man:libvirt-guests(8)
 Documentation=https://libvirt.org
 
 [Service]
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
+EnvironmentFile=-@initconfdir@/libvirt-guests
 # Hack just call traditional service until we factor
 # out the code
 ExecStart=@libexecdir@/libvirt-guests.sh start

diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
index 87f96af14daadd05f7e6134f824bd2110e767f1d..016014215f3a2d9b36a2aa1df167c2d0e1e5e040 100644 (file)
--- a/tools/libvirt-guests.sh.in
+++ b/tools/libvirt-guests.sh.in
@@ -18,6 +18,7 @@
 
 sysconfdir="@sysconfdir@"
 localstatedir="@localstatedir@"
+initconfdir="@initconfdir@"
 libvirtd="@sbindir@"/libvirtd
 
 # Source function library.
@@ -39,8 +40,8 @@ START_DELAY=0
 BYPASS_CACHE=0
 SYNC_TIME=0
 
-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
-    . "$sysconfdir"/sysconfig/libvirt-guests
+test -f "$initconfdir"/libvirt-guests &&
+    . "$initconfdir"/libvirt-guests
 
 LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
 VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests

diff --git a/tools/meson.build b/tools/meson.build
index fad7f202ade0e59816132274c2d02c056e72c153..f2d58cfdcbfb209870eaa5550aa1f5a1ee37d8f3 100644 (file)
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -241,6 +241,7 @@ tools_conf = configuration_data({
   'sbindir': sbindir,
   'schemadir': pkgdatadir / 'schemas',
   'sysconfdir': sysconfdir,
+  'initconfdir': initconfdir,
 })
 
 configure_file(

diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in
index 7100eafb6316d2e5f26c93db38dde60f185196ca..c91f247ba507d7011639b615f910d3790f5c95e0 100644 (file)
--- a/tools/virt-pki-validate.in
+++ b/tools/virt-pki-validate.in
@@ -73,6 +73,7 @@ echo Found "$CERTOOL"
 #
 SYSCONFDIR="@sysconfdir@"
 PKI="$SYSCONFDIR/pki"
+INITCONFDIR="@initconfdir@"
 if [ ! -d "$PKI" ]
 then
     echo the $PKI directory is missing, it is usually
@@ -294,24 +295,24 @@ fi
 
 if [ "$SERVER" = "1" ]
 then
-    if [ -r "$SYSCONFDIR"/sysconfig/libvirtd ]
+    if [ -r "$INITCONFDIR"/libvirtd ]
     then
-        if grep "^LIBVIRTD_ARGS.*--listen" "$SYSCONFDIR"/sysconfig/libvirtd \
+        if grep "^LIBVIRTD_ARGS.*--listen" "$INITCONFDIR"/libvirtd \
             >/dev/null 2>&1
         then
             :
         else
-            echo Make sure "$SYSCONFDIR"/sysconfig/libvirtd is setup to listen to
+            echo Make sure "$INITCONFDIR"/libvirtd is setup to listen to
             echo TCP/IP connections and restart the libvirtd service
         fi
     fi
-    if [ -r "$SYSCONFDIR"/sysconfig/iptables ]
+    if [ -r "$INITCONFDIR"/iptables ]
     then
-        if grep "$PORT" "$SYSCONFDIR"/sysconfig/iptables >/dev/null 2>&1
+        if grep "$PORT" "$INITCONFDIR"/iptables >/dev/null 2>&1
         then
             :
         else
-            echo Make sure "$SYSCONFDIR"/sysconfig/iptables is setup to allow
+            echo Make sure "$INITCONFDIR"/iptables is setup to allow
             echo incoming TCP/IP connections on port $PORT and
             echo restart the iptables service
         fi