mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
oxenstored: honour XEN_{LOG,RUN}_DIR in oxenstored.conf
Generate oxenstored.conf with configure. This involves modifying tools/configure.ac and rerun autogen.sh. Signed-off-by: Wei Liu <wei.liu2@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
Wei Liu committed
1 parent
10055f661e
commit
c84a1fa2e6
4 files changed
+7
-4
No files matched your search
@@ -346,6 +346,7 @@ tools/ocaml/libs/xentoollog/_xtl_levels.*
|
||||
tools/ocaml/libs/xentoollog/xentoollog.ml
|
||||
tools/ocaml/libs/xentoollog/xentoollog.mli
|
||||
tools/ocaml/xenstored/oxenstored
|
||||
tools/ocaml/xenstored/oxenstored.conf
|
||||
tools/ocaml/test/xtl
|
||||
tools/ocaml/test/send_debug_keys
|
||||
tools/ocaml/test/list_domains
|
||||
|
||||
Vendored
+2
-1
@@ -2408,7 +2408,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in"
|
||||
ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in ocaml/xenstored/oxenstored.conf"
|
||||
|
||||
ac_config_headers="$ac_config_headers config.h"
|
||||
|
||||
@@ -10374,6 +10374,7 @@ do
|
||||
"hotplug/NetBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xendriverdomain" ;;
|
||||
"libxl/xenlight.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xenlight.pc.in" ;;
|
||||
"libxl/xlutil.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xlutil.pc.in" ;;
|
||||
"ocaml/xenstored/oxenstored.conf") CONFIG_FILES="$CONFIG_FILES ocaml/xenstored/oxenstored.conf" ;;
|
||||
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
||||
"hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/proc-xen.mount" ;;
|
||||
"hotplug/Linux/systemd/var-lib-xenstored.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/var-lib-xenstored.mount" ;;
|
||||
|
||||
@@ -21,6 +21,7 @@ hotplug/NetBSD/rc.d/xencommons
|
||||
hotplug/NetBSD/rc.d/xendriverdomain
|
||||
libxl/xenlight.pc.in
|
||||
libxl/xlutil.pc.in
|
||||
ocaml/xenstored/oxenstored.conf
|
||||
])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_AUX_DIR([../])
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# default xenstored config
|
||||
|
||||
# Where the pid file is stored
|
||||
pid-file = /var/run/xenstored.pid
|
||||
pid-file = @XEN_RUN_DIR@/xenstored.pid
|
||||
|
||||
# Randomly failed a transaction with EAGAIN. Used for testing Xs user
|
||||
test-eagain = false
|
||||
@@ -24,12 +24,12 @@ quota-maxrequests = 1024
|
||||
persistent = false
|
||||
|
||||
# Xenstored logs
|
||||
# xenstored-log-file = /var/log/xenstored.log
|
||||
# xenstored-log-file = @XEN_LOG_DIR@/xenstored.log
|
||||
# xenstored-log-level = null
|
||||
# xenstored-log-nb-files = 10
|
||||
|
||||
# Xenstored access logs
|
||||
# access-log-file = /var/log/xenstored-access.log
|
||||
# access-log-file = @XEN_LOG_DIR@/xenstored-access.log
|
||||
# access-log-nb-lines = 13215
|
||||
# acesss-log-nb-chars = 180
|
||||
# access-log-special-ops = false
|
||||