diff options
| author |   Eric Blake <eblake@redhat.com> | 2010-11-16 07:54:17 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2010-11-17 08:58:58 -0700 |
| commit | 0d5f54bb2158528c603d34b29e0faab9ca23a93b (patch) | |
| tree | 80340c59abed2728540b18c3a3514e68cc1d8228 /src/secret | |
| parent | replace last instances of close() (diff) | |
| download | libvirt-0d5f54bb2158528c603d34b29e0faab9ca23a93b.tar.gz libvirt-0d5f54bb2158528c603d34b29e0faab9ca23a93b.tar.bz2 libvirt-0d5f54bb2158528c603d34b29e0faab9ca23a93b.zip | |
maint: use gnulib configmake rather than open-coding things
* bootstrap.conf (gnulib_modules): Add configmake.
* daemon/Makefile.am (libvirtd_CFLAGS): Drop defines provided by
gnulib.
* src/Makefile.am (INCLUDES): Likewise.
* tests/Makefile.am (INCLUDES): Likewise.
* tools/Makefile.am (virsh_CFLAGS): Likewise.
* daemon/libvirtd.c (qemudInitPaths, usage, main): Update
clients.
* src/cpu/cpu_map.c (CPUMAPFILE): Likewise.
* src/driver.c (DEFAULT_DRIVER_DIR): Likewise.
* src/internal.h (_): Likewise.
* src/libvirt.c (virInitialize): Likewise.
* src/lxc/lxc_conf.h (LXC_CONFIG_DIR, LXC_STATE_DIR, LXC_LOG_DIR):
Likewise.
* src/lxc/lxc_conf.c (lxcCapsInit, lxcLoadDriverConfig):
Likewise.
* src/network/bridge_driver.c (NETWORK_PID_DIR)
(NETWORK_STATE_DIR, DNSMASQ_STATE_DIR, networkStartup): Likewise.
* src/nwfilter/nwfilter_driver.c (nwfilterDriverStartup):
Likewise.
* src/qemu/qemu_conf.c (qemudLoadDriverConfig): Likewise.
* src/qemu/qemu_driver.c (qemudStartup): Likewise.
* src/remote/remote_driver.h (LIBVIRTD_PRIV_UNIX_SOCKET)
(LIBVIRTD_PRIV_UNIX_SOCKET_RO, LIBVIRTD_CONFIGURATION_FILE)
(LIBVIRT_PKI_DIR): Likewise.
* src/secret/secret_driver.c (secretDriverStartup): Likewise.
* src/security/security_apparmor.c (VIRT_AA_HELPER): Likewise.
* src/security/virt-aa-helper.c (main): Likewise.
* src/storage/storage_backend_disk.c (PARTHELPER): Likewise.
* src/storage/storage_driver.c (storageDriverStartup): Likewise.
* src/uml/uml_driver.c (TEMPDIR, umlStartup): Likewise.
* src/util/hooks.c (LIBVIRT_HOOK_DIR): Likewise.
* tools/virsh.c (main): Likewise.
* docs/hooks.html.in: Likewise.
Diffstat (limited to 'src/secret')
| -rw-r--r-- | src/secret/secret_driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 2b5a7c6e7..c5a876bed 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -42,6 +42,7 @@ #include "uuid.h" #include "virterror_internal.h" #include "files.h" +#include "configmake.h" #define VIR_FROM_THIS VIR_FROM_SECRET @@ -994,7 +995,7 @@ secretDriverStartup(int privileged) secretDriverLock(driverState); if (privileged) { - base = strdup(SYSCONF_DIR "/libvirt"); + base = strdup(SYSCONFDIR "/libvirt"); if (base == NULL) goto out_of_memory; } else { |