Skip to content

L
lxc
Unverified Commit 6203554b by Felix Abecassis Committed by Christian Brauner
Options

conf: do lxc.mount.entry mounts right after lxc.mount.fstab

These configuration options use the same syntax and therefore it seems more intuitive to have the same behavior for both of them, which is not the case today since mount hooks and autodev mounts are called between the two. See: https://github.com/lxc/lxc/issues/2932Signed-off-by: 's avatarFelix Abecassis <fabecassis@nvidia.com>
parent 404b9449
Showing with 9 additions and 9 deletions
src/lxc/conf.c
...@@ -3493,6 +3493,15 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3493,6 +3493,15 @@ int lxc_setup(struct lxc_handler *handler)
return -1; return -1;
} }
if (!lxc_list_empty(&lxc_conf->mount_list)) {
ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
&lxc_conf->mount_list, name, lxcpath);
if (ret < 0) {
ERROR("Failed to setup mount entries");
return -1;
}
}
if (lxc_conf->is_execute) { if (lxc_conf->is_execute) {
if (execveat_supported()) { if (execveat_supported()) {
int fd; int fd;
...@@ -3551,15 +3560,6 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3551,15 +3560,6 @@ int lxc_setup(struct lxc_handler *handler)
} }
} }
if (!lxc_list_empty(&lxc_conf->mount_list)) {
ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
&lxc_conf->mount_list, name, lxcpath);
if (ret < 0) {
ERROR("Failed to setup mount entries");
return -1;
}
}
/* Make sure any start hooks are in the container */ /* Make sure any start hooks are in the container */
if (!verify_start_hooks(lxc_conf)) { if (!verify_start_hooks(lxc_conf)) {
ERROR("Failed to verify start hooks"); ERROR("Failed to verify start hooks");
......
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