[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v2] tools: remove unused sysconfig variable XENSTORED_ROOTDIR
The sysconfig variable XENSTORED_ROOTDIR is not used anymore. It used to point to a directory with tdb files, which is now a tmpfs. In case the database is not in tmpfs, like on sysv and BSD systems, xenstored will truncate existing database files during start. Fixes commit 2ef6ace428dec4795b8b0a67fff6949e817013de Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> --- tools/hotplug/FreeBSD/rc.d/xencommons.in | 5 ----- tools/hotplug/Linux/init.d/sysconfig.xencommons.in | 7 ------- tools/hotplug/Linux/launch-xenstore.in | 1 - tools/hotplug/NetBSD/rc.d/xencommons.in | 5 ----- 4 files changed, 18 deletions(-) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index 4c61d8c94e..fddcce314c 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -42,11 +42,6 @@ xen_startcmd() xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${XENSTORED}) if test -z "$xenstored_pid"; then - printf "Cleaning xenstore database.\n" - if [ -z "${XENSTORED_ROOTDIR}" ]; then - XENSTORED_ROOTDIR="@XEN_LIB_STORED@" - fi - rm -f ${XENSTORED_ROOTDIR}/tdb* >/dev/null 2>&1 printf "Starting xenservices: xenstored, xenconsoled." XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}" if [ -n "${XENSTORED_TRACE}" ]; then diff --git a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in index b059a2910d..00cf7f91d4 100644 --- a/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ b/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -48,13 +48,6 @@ XENSTORED_ARGS= # Only evaluated if XENSTORETYPE is "daemon". #XENSTORED_TRACE=[yes|on|1] -## Type: string -## Default: "@XEN_LIB_STORED@" -# -# Running xenstored on XENSTORED_ROOTDIR -# Only evaluated if XENSTORETYPE is "daemon". -#XENSTORED_ROOTDIR=@XEN_LIB_STORED@ - ## Type: string ## Default: @LIBEXEC@/boot/xenstore-stubdom.gz # diff --git a/tools/hotplug/Linux/launch-xenstore.in b/tools/hotplug/Linux/launch-xenstore.in index fa4ea4af49..d40c66482a 100644 --- a/tools/hotplug/Linux/launch-xenstore.in +++ b/tools/hotplug/Linux/launch-xenstore.in @@ -66,7 +66,6 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF [ "$XENSTORETYPE" = "" ] && XENSTORETYPE=daemon [ "$XENSTORETYPE" = "daemon" ] && { - [ -z "$XENSTORED_ROOTDIR" ] && XENSTORED_ROOTDIR="@XEN_LIB_STORED@" [ -z "$XENSTORED_TRACE" ] || XENSTORED_ARGS="$XENSTORED_ARGS -T @XEN_LOG_DIR@/xenstored-trace.log" [ -z "$XENSTORED" ] && XENSTORED=@XENSTORED@ [ -x "$XENSTORED" ] || { diff --git a/tools/hotplug/NetBSD/rc.d/xencommons.in b/tools/hotplug/NetBSD/rc.d/xencommons.in index 80e518f5de..cf2af06596 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons.in +++ b/tools/hotplug/NetBSD/rc.d/xencommons.in @@ -38,11 +38,6 @@ xen_startcmd() xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${sbindir}/xenstored) if test -z "$xenstored_pid"; then - printf "Cleaning xenstore database.\n" - if [ -z "${XENSTORED_ROOTDIR}" ]; then - XENSTORED_ROOTDIR="@XEN_LIB_STORED@" - fi - rm -f ${XENSTORED_ROOTDIR}/tdb* >/dev/null 2>&1 printf "Starting xenservices: xenstored, xenconsoled." XENSTORED_ARGS=" --pid-file ${XENSTORED_PIDFILE}" if [ -n "${XENSTORED_TRACE}" ]; then
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |