diff options
| author | Andrea Bolognani <abologna@redhat.com> | 2023-04-29 18:23:12 +0200 |
|---|---|---|
| committer | Andrea Bolognani <abologna@redhat.com> | 2023-05-05 15:08:25 +0200 |
| commit | 32f772e98659eba8b93e940698102464c4b91209 (patch) | |
| tree | 3657c9b95b95ef21e647525cc966427eb7ebed43 /tools | |
| parent | 9850b37e3942c7309ee54fe3f13421ccda660b74 (diff) | |
| download | libvirt-32f772e98659eba8b93e940698102464c4b91209.tar.gz | |
meson: Use initconfdir
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libvirt-guests.service.in | 2 | ||||
| -rw-r--r-- | tools/libvirt-guests.sh.in | 5 | ||||
| -rw-r--r-- | tools/meson.build | 1 | ||||
| -rw-r--r-- | tools/virt-pki-validate.in | 13 |
4 files changed, 12 insertions, 9 deletions
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 1c569c320d..c547218f2a 100644 --- 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 87f96af14d..016014215f 100644 --- 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 fad7f202ad..f2d58cfdcb 100644 --- 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 7100eafb63..c91f247ba5 100644 --- 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 |