Skip to content

Commit

Permalink
start: Fix print_top_failing_dir for /var/lib/lxc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stgraber committed Feb 27, 2014
1 parent 969b7d7 commit ef325ba
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/lxc/start.c
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit ef325ba

Please sign in to comment.