aboutsummaryrefslogtreecommitdiffstats
path: root/tools/xenballoon/xenballoond
diff options
context:
space:
mode:
author <bruce.edge@gmail.com>2010-09-20 17:54:25 +0100
committer <bruce.edge@gmail.com>2010-09-20 17:54:25 +0100
commit744d6961f91581f603c0f285f52c4b23fa30ad4c (patch)
treeaa4234e9410ff44dc0abbea0d5f2e4b1b6ce66cc /tools/xenballoon/xenballoond
parent1e7aadfdffeee8f6f62c7f06a34966d62d2c297f (diff)
downloadxen-744d6961f91581f603c0f285f52c4b23fa30ad4c.tar.gz
xen-744d6961f91581f603c0f285f52c4b23fa30ad4c.tar.bz2
xen-744d6961f91581f603c0f285f52c4b23fa30ad4c.zip
tools, build system: Make changing distro-specific layout aspects easier
Introduce CONFIG_LEAF_DIR, SUBSYS_DIR, INITD_DIR variables to cope better with variation between distributions. See docs/misc/distro_mapping.txt for details. Signed-off-by: Bruce Edge <bruce.edge@gmail.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/xenballoon/xenballoond')
-rw-r--r--tools/xenballoon/xenballoond9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/xenballoon/xenballoond b/tools/xenballoon/xenballoond
index d8f43461de..121aa3e490 100644
--- a/tools/xenballoon/xenballoond
+++ b/tools/xenballoon/xenballoond
@@ -21,7 +21,7 @@
# If xenbus is running and the /usr/bin/xenstore-* tools are installed,
# "xenbus is enabled".
#
-# Parameters are documented in /etc/sysconfig/xenballoon.conf. Although
+# Parameters are documented in <SYSCONFIG>/xenballoon.conf. Although
# some are not used with directed ballooning, all must be set properly.
# If xenbus is enabled, some of these parameters may be overridden by values
# set by domain0 via xenbus.
@@ -237,7 +237,12 @@ else
fi
preswapnow=0
-. /etc/sysconfig/xenballoon.conf
+# See docs/misc/distro_mapping.txt
+if [ -f /etc/sysconfig/xenballoon.conf ]; then
+ . /etc/sysconfig/xenballoon.conf
+elif [ -f /etc/default/xenballoon.conf ]; then
+ . /etc/default/xenballoon.conf
+fi
while true;
do