The mount_entry_create_*_dirs() functions currently assume that the rootfs of
the container is actually named "rootfs". This has the consequence that
del = strstr(lxcpath, "/rootfs");
if (!del) {
free(lxcpath);
lxc_free_array((void **)opts, free);
return -1;
}
*del = '\0';
will return NULL when the rootfs of a container is not actually named "rootfs".
This means the we return -1 and do not create the necessary upperdir/workdir
directories required for the overlay/aufs mount to work. Hence, let's not make
that assumption. We now pass lxc_path and lxc_name to
mount_entry_create_*_dirs() and create the path directly. To prevent failure we
also have mount_entry_create_*_dirs() check that lxc_name and lxc_path are not
empty when they are passed in.
Signed-off-by:
Christian Brauner <christianvanbrauner@gmail.com>
Acked-by:
Serge E. Hallyn <serge.hallyn@ubuntu.com>
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| legacy | Loading commit data... | |
| lsm | Loading commit data... | |
| Makefile.am | Loading commit data... | |
| af_unix.c | Loading commit data... | |
| af_unix.h | Loading commit data... | |
| arguments.c | Loading commit data... | |
| arguments.h | Loading commit data... | |
| attach.c | Loading commit data... | |
| attach.h | Loading commit data... | |
| attach_options.h | Loading commit data... | |
| bdev.c | Loading commit data... | |
| bdev.h | Loading commit data... | |
| caps.c | Loading commit data... | |
| caps.h | Loading commit data... | |
| cgfs.c | Loading commit data... | |
| cgmanager.c | Loading commit data... | |
| cgroup.c | Loading commit data... | |
| cgroup.h | Loading commit data... | |
| commands.c | Loading commit data... | |
| commands.h | Loading commit data... | |
| conf.c | Loading commit data... | |
| conf.h | Loading commit data... | |
| confile.c | Loading commit data... | |
| confile.h | Loading commit data... | |
| console.c | Loading commit data... | |
| console.h | Loading commit data... | |
| criu.c | Loading commit data... | |
| criu.h | Loading commit data... | |
| error.c | Loading commit data... | |
| error.h | Loading commit data... | |
| execute.c | Loading commit data... | |
| freezer.c | Loading commit data... | |
| genl.c | Loading commit data... | |
| genl.h | Loading commit data... | |
| initutils.c | Loading commit data... | |
| initutils.h | Loading commit data... | |
| list.h | Loading commit data... | |
| log.c | Loading commit data... | |
| log.h | Loading commit data... | |
| lxc-btrfs.h | Loading commit data... | |
| lxc-checkconfig.in | Loading commit data... | |
| lxc-ls.in | Loading commit data... | |
| lxc-start-ephemeral.in | Loading commit data... | |
| lxc-top.lua | Loading commit data... | |
| lxc.functions.in | Loading commit data... | |
| lxc.h | Loading commit data... | |
| lxc_attach.c | Loading commit data... | |
| lxc_autostart.c | Loading commit data... | |
| lxc_cgroup.c | Loading commit data... | |
| lxc_checkpoint.c | Loading commit data... | |
| lxc_clone.c | Loading commit data... | |
| lxc_config.c | Loading commit data... | |
| lxc_console.c | Loading commit data... | |
| lxc_create.c | Loading commit data... | |
| lxc_destroy.c | Loading commit data... | |
| lxc_device.c | Loading commit data... | |
| lxc_execute.c | Loading commit data... | |
| lxc_freeze.c | Loading commit data... | |
| lxc_info.c | Loading commit data... | |
| lxc_init.c | Loading commit data... | |
| lxc_monitor.c | Loading commit data... | |
| lxc_monitord.c | Loading commit data... | |
| lxc_snapshot.c | Loading commit data... | |
| lxc_start.c | Loading commit data... | |
| lxc_stop.c | Loading commit data... | |
| lxc_top.c | Loading commit data... | |
| lxc_unfreeze.c | Loading commit data... | |
| lxc_unshare.c | Loading commit data... | |
| lxc_user_nic.c | Loading commit data... | |
| lxc_usernsexec.c | Loading commit data... | |
| lxc_wait.c | Loading commit data... | |
| lxccontainer.c | Loading commit data... | |
| lxccontainer.h | Loading commit data... | |
| lxclock.c | Loading commit data... | |
| lxclock.h | Loading commit data... | |
| lxcseccomp.h | Loading commit data... | |
| lxcutmp.c | Loading commit data... | |
| lxcutmp.h | Loading commit data... | |
| mainloop.c | Loading commit data... | |
| mainloop.h | Loading commit data... | |
| monitor.c | Loading commit data... | |
| monitor.h | Loading commit data... | |
| namespace.c | Loading commit data... | |
| namespace.h | Loading commit data... | |
| network.c | Loading commit data... | |
| network.h | Loading commit data... | |
| nl.c | Loading commit data... | |
| nl.h | Loading commit data... | |
| parse.c | Loading commit data... | |
| parse.h | Loading commit data... | |
| rtnl.c | Loading commit data... | |
| rtnl.h | Loading commit data... | |
| seccomp.c | Loading commit data... | |
| start.c | Loading commit data... | |
| start.h | Loading commit data... | |
| state.c | Loading commit data... | |
| state.h | Loading commit data... | |
| sync.c | Loading commit data... | |
| sync.h | Loading commit data... | |
| utils.c | Loading commit data... | |
| utils.h | Loading commit data... | |
| version.h.in | Loading commit data... |