Skip to content

L
lxc
Commit 2d533d7a by David Ward Committed by Stéphane Graber
Options

Fix verification of start hook without a rootfs

Signed-off-by: 's avatarDavid Ward <david.ward@ll.mit.edu> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent 9a2e239d
Showing with 3 additions and 3 deletions
src/lxc/conf.c
...@@ -3627,12 +3627,12 @@ static bool verify_start_hooks(struct lxc_conf *conf) ...@@ -3627,12 +3627,12 @@ static bool verify_start_hooks(struct lxc_conf *conf)
int ret; int ret;
ret = snprintf(path, MAXPATHLEN, "%s%s", ret = snprintf(path, MAXPATHLEN, "%s%s",
conf->rootfs.mount, hookname); conf->rootfs.path ? conf->rootfs.mount : "", hookname);
if (ret < 0 || ret >= MAXPATHLEN) if (ret < 0 || ret >= MAXPATHLEN)
return false; return false;
ret = stat(path, &st); ret = stat(path, &st);
if (ret) { if (ret) {
SYSERROR("Start hook %s not found in container rootfs", SYSERROR("Start hook %s not found in container",
hookname); hookname);
return false; return false;
} }
...@@ -3732,7 +3732,7 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3732,7 +3732,7 @@ int lxc_setup(struct lxc_handler *handler)
return -1; return -1;
} }
/* Make sure any start hooks are in the rootfs */ /* Make sure any start hooks are in the container */
if (!verify_start_hooks(lxc_conf)) if (!verify_start_hooks(lxc_conf))
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment