Commit 52b91dad authored by Olaf Hering's avatar Olaf Hering Committed by Andrew Cooper

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: 2ef6ace4 ("tools: don't remove tdb data base file before starting xenstored")
Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Acked-by: default avatarAndrew Cooper <andrew.cooper3@citrix.com>
Acked-by: default avatarWei Liu <wl@xen.org>
parent d4fb5f16
......@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [unstable UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
### Removed
- XENSTORED_ROOTDIR environment variable from configuartion files and
initscripts, due to being unused.
## [4.15.0 UNRELEASED](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.15.0) - TBD
### Added / support upgraded
......
......@@ -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
......
......@@ -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
#
......
......@@ -53,7 +53,6 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . @CONFIG_DIR@/@CONFIG_LEAF
/bin/mkdir -p @XEN_RUN_DIR@
[ "$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" ] || {
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment