[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 4/6] src: honour the RUNSTATEDIR variable in all code



On 8/21/19 1:50 PM, Daniel P. Berrangé wrote:
All code using LOCALSTATEDIR "/run" is updated to use RUNSTATEDIR
instead. The exception is the remote driver client which still
uses LOCALSTATEDIR "/run". The client needs to connect to remote
machines which may not be using /run, so /var/run is more portable
due to the /var/run -> /run symlink.

Some duplicate paths in the apparmor code are also purged.

There's no functional change by default yet since both expressions
expand to the same value.

Signed-off-by: Daniel P. Berrangé <berrange redhat com>
---
  src/bhyve/bhyve_utils.h                 |  2 +-
  src/interface/interface_backend_netcf.c |  2 +-
  src/interface/interface_backend_udev.c  |  2 +-
  src/libvirt-admin.c                     |  2 +-
  src/libxl/libxl_conf.h                  |  2 +-
  src/locking/lock_daemon.c               | 18 +++++++-------
  src/locking/lock_driver_lockd.c         |  2 +-
  src/locking/virtlockd.pod               |  8 +++---
  src/logging/log_daemon.c                | 18 +++++++-------
  src/logging/log_manager.c               |  2 +-
  src/logging/virtlogd.pod                |  8 +++---
  src/lxc/lxc_conf.h                      |  2 +-
  src/lxc/lxc_process.c                   |  2 +-
  src/network/bridge_driver.c             |  4 +--
  src/network/leaseshelper.c              |  2 +-
  src/node_device/node_device_hal.c       |  2 +-
  src/node_device/node_device_udev.c      |  2 +-
  src/nwfilter/nwfilter_dhcpsnoop.c       |  4 +--
  src/nwfilter/nwfilter_driver.c          |  4 +--
  src/qemu/qemu_conf.c                    |  4 +--
  src/remote/libvirtd.pod                 | 10 ++++----
  src/remote/remote_daemon.c              | 24 +++++++++---------
  src/remote/remote_daemon_dispatch.c     |  4 +--
  src/remote/remote_driver.c              |  6 +++++
  src/secret/secret_driver.c              |  2 +-
  src/security/virt-aa-helper.c           | 20 ++++++---------
  src/storage/storage_driver.c            |  2 +-
  src/util/virhostdev.c                   |  2 +-
  src/util/virpidfile.c                   |  8 +++---
  src/util/virsystemd.c                   | 33 ++++++++++++++++---------
  src/vz/vz_driver.c                      |  2 +-
  31 files changed, 109 insertions(+), 96 deletions(-)



diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 60c9b75980..deadfb7da0 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1232,8 +1232,8 @@ get_files(vahControl * ctl)
/* Unix socket for QEMU and swtpm to use */
              virBufferAsprintf(&buf,
-                "  \"/run/libvirt/qemu/swtpm/%s-swtpm.sock\" rw,\n",
-                shortName);
+                "  \"%/libvirt/qemu/swtpm/%s-swtpm.sock\" rw,\n",

%s

+                RUNSTATEDIR, shortName);
              /* Paths for swtpm to use: give it access to its state
               * directory, log, and PID files.
               */

Michal


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]