start: Fix print_top_failing_dir for /var/lib/lxc

In the case where /var/lib/lxc itself was not accessible, print_top_failing_dir would fail to print the error message. This fixes it and also change the initial access check for X_OK instead of R_OK (to match what we actually need and print_top_failing_dir's own check). Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>

start: Fix print_top_failing_dir for /var/lib/lxc
99b71824 · Stéphane Graber · fda03e44 · 99b71824
Commit 99b71824 authored Feb 27, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

start.c src/lxc/start.c +1 -3

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -94,8 +94,6 @@ static void print_top_failing_dir(const char *path)
 	while (p < e) {
 		while (p < e && *p == '/') p++;
 		while (p < e && *p != '/') p++;
-		if (p >= e)
-			return;
 		saved = *p;
 		*p = '\0';
 		if (access(copy, X_OK)) {
@@ -666,7 +664,7 @@ static int do_start(void *data)
 		}
 	}

-	if (access(handler->lxcpath, R_OK)) {
+	if (access(handler->lxcpath, X_OK)) {
 		print_top_failing_dir(handler->lxcpath);
 		goto out_warn_father;
 	}