From 4586090bbd9f8d5adf566a51a48d183ec6dd4655 Mon Sep 17 00:00:00 2001 From: George Dunlap Date: Fri, 29 Jun 2012 17:36:50 +0100 Subject: 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 Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/xl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tools/libxl/xl.c') 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; -- cgit v1.2.3