aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/xl.c
diff options
context:
space:
mode:
authorGeorge Dunlap <george.dunlap@eu.citrix.com>2012-06-29 17:36:50 +0100
committerGeorge Dunlap <george.dunlap@eu.citrix.com>2012-06-29 17:36:50 +0100
commit4586090bbd9f8d5adf566a51a48d183ec6dd4655 (patch)
tree24c9d47d3d45d135248fed2aa918c931eb2c2916 /tools/libxl/xl.c
parent705e756e45508488d094d2f07bd85c5cc3d46f26 (diff)
downloadxen-4586090bbd9f8d5adf566a51a48d183ec6dd4655.tar.gz
xen-4586090bbd9f8d5adf566a51a48d183ec6dd4655.tar.bz2
xen-4586090bbd9f8d5adf566a51a48d183ec6dd4655.zip
xl: Clarify 'xend is running' error message
* Give reason for check (unpredictable results) * Give a better recommendation (shut down xend) * Make it clear that -f is overriding a safety check. Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/xl.c')
-rw-r--r--tools/libxl/xl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index a5ada035e0..d6f2b3ead2 100644
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -251,9 +251,9 @@ int main(int argc, char **argv)
for (int i = 0; i < sizeof(locks)/sizeof(locks[0]); i++) {
if (!access(locks[i], F_OK) && !force_execution) {
fprintf(stderr,
-"xend is running, which prevents xl from working correctly.\n"
-"If you still want to force the execution of xl please use the -f\n"
-"option.\n"
+"xend is running, which may cause unpredictable results when using\n"
+"this xl command. Please shut down xend before continuing.\n\n"
+"(This check can be overridden with the -f option.)\n"
);
ret = 1;
goto xit;