Skip to content

L
lxc
Unverified Commit 8353b4c9 by Christian Brauner
Options

conf: non-functional changes

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 3f69fb12
Showing with 94 additions and 60 deletions
src/lxc/conf.c
...@@ -3180,7 +3180,7 @@ void remount_all_slave(void) ...@@ -3180,7 +3180,7 @@ void remount_all_slave(void)
free(line); free(line);
} }
void lxc_execute_bind_init(struct lxc_conf *conf) static int lxc_execute_bind_init(struct lxc_conf *conf)
{ {
int ret; int ret;
char path[PATH_MAX], destpath[PATH_MAX], *p; char path[PATH_MAX], destpath[PATH_MAX], *p;
...@@ -3189,39 +3189,44 @@ void lxc_execute_bind_init(struct lxc_conf *conf) ...@@ -3189,39 +3189,44 @@ void lxc_execute_bind_init(struct lxc_conf *conf)
p = choose_init(conf->rootfs.mount); p = choose_init(conf->rootfs.mount);
if (p) { if (p) {
free(p); free(p);
return; return 0;
} }
ret = snprintf(path, PATH_MAX, SBINDIR "/init.lxc.static"); ret = snprintf(path, PATH_MAX, SBINDIR "/init.lxc.static");
if (ret < 0 || ret >= PATH_MAX) { if (ret < 0 || ret >= PATH_MAX) {
WARN("Path name too long searching for lxc.init.static"); ERROR("Path name too long searching for lxc.init.static");
return; return -1;
} }
if (!file_exists(path)) { if (!file_exists(path)) {
INFO("%s does not exist on host", path); ERROR("%s does not exist on host", path);
return; return -1;
} }
ret = snprintf(destpath, PATH_MAX, "%s%s", conf->rootfs.mount, "/init.lxc.static"); ret = snprintf(destpath, PATH_MAX, "%s%s", conf->rootfs.mount, "/init.lxc.static");
if (ret < 0 || ret >= PATH_MAX) { if (ret < 0 || ret >= PATH_MAX) {
WARN("Path name too long for container's lxc.init.static"); ERROR("Path name too long for container's lxc.init.static");
return; return -1;
} }
if (!file_exists(destpath)) { if (!file_exists(destpath)) {
FILE * pathfile = fopen(destpath, "wb"); FILE *pathfile = fopen(destpath, "wb");
if (!pathfile) { if (!pathfile) {
SYSERROR("Failed to create mount target '%s'", destpath); SYSERROR("Failed to create mount target \"%s\"", destpath);
return; return -1;
} }
fclose(pathfile); fclose(pathfile);
} }
ret = safe_mount(path, destpath, "none", MS_BIND, NULL, conf->rootfs.mount); ret = safe_mount(path, destpath, "none", MS_BIND, NULL, conf->rootfs.mount);
if (ret < 0) if (ret < 0) {
SYSERROR("Failed to bind lxc.init.static into container"); SYSERROR("Failed to bind lxc.init.static into container");
INFO("lxc.init.static bound into container at %s", path); return -1;
}
INFO("Bind mounted lxc.init.static into container at \"%s\"", path);
return 0;
} }
/* /*
...@@ -3291,45 +3296,52 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3291,45 +3296,52 @@ int lxc_setup(struct lxc_handler *handler)
struct lxc_conf *lxc_conf = handler->conf; struct lxc_conf *lxc_conf = handler->conf;
const char *lxcpath = handler->lxcpath; const char *lxcpath = handler->lxcpath;
if (do_rootfs_setup(lxc_conf, name, lxcpath) < 0) { ret = do_rootfs_setup(lxc_conf, name, lxcpath);
ERROR("Error setting up rootfs mount after spawn"); if (ret < 0) {
ERROR("Failed to setup rootfs");
return -1; return -1;
} }
if (handler->nsfd[LXC_NS_UTS] == -1) { if (handler->nsfd[LXC_NS_UTS] == -1) {
if (setup_utsname(lxc_conf->utsname)) { ret = setup_utsname(lxc_conf->utsname);
if (ret < 0) {
ERROR("failed to setup the utsname for '%s'", name); ERROR("failed to setup the utsname for '%s'", name);
return -1; return -1;
} }
} }
if (lxc_setup_network_in_child_namespaces(lxc_conf, &lxc_conf->network)) { ret = lxc_setup_network_in_child_namespaces(lxc_conf, &lxc_conf->network);
ERROR("failed to setup the network for '%s'", name); if (ret < 0) {
ERROR("Failed to setup network");
return -1; return -1;
} }
if (lxc_network_send_name_and_ifindex_to_parent(handler) < 0) { ret = lxc_network_send_name_and_ifindex_to_parent(handler);
ERROR("Failed to network device names and ifindices to parent"); if (ret < 0) {
ERROR("Failed to send network device names and ifindices to parent");
return -1; return -1;
} }
if (lxc_conf->autodev > 0) { if (lxc_conf->autodev > 0) {
if (mount_autodev(name, &lxc_conf->rootfs, lxcpath)) { ret = mount_autodev(name, &lxc_conf->rootfs, lxcpath);
ERROR("failed to mount /dev in the container"); if (ret < 0) {
ERROR("Failed to mount \"/dev\"");
return -1; return -1;
} }
} }
/* do automatic mounts (mainly /proc and /sys), but exclude /* Do automatic mounts (mainly /proc and /sys), but exclude those that
* those that need to wait until other stuff has finished * need to wait until other stuff has finished.
*/ */
if (lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & ~LXC_AUTO_CGROUP_MASK, handler) < 0) { ret = lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & ~LXC_AUTO_CGROUP_MASK, handler);
ERROR("failed to setup the automatic mounts for '%s'", name); if (ret < 0) {
ERROR("Failed to setup first automatic mounts");
return -1; return -1;
} }
if (setup_mount(lxc_conf, &lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath)) { ret = setup_mount(lxc_conf, &lxc_conf->rootfs, lxc_conf->fstab, name, lxcpath);
ERROR("failed to setup the mounts for '%s'", name); if (ret < 0) {
ERROR("Failed to setup mounts");
return -1; return -1;
} }
...@@ -3337,38 +3349,51 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3337,38 +3349,51 @@ int lxc_setup(struct lxc_handler *handler)
if (!verify_start_hooks(lxc_conf)) if (!verify_start_hooks(lxc_conf))
return -1; return -1;
if (lxc_conf->is_execute) if (lxc_conf->is_execute) {
lxc_execute_bind_init(lxc_conf); ret = lxc_execute_bind_init(lxc_conf);
if (ret < 0) {
ERROR("Failed to bind-mount the lxc init system");
return -1;
}
}
/* now mount only cgroup, if wanted; /* Now mount only cgroups, if wanted. Before, /sys could not have been
* before, /sys could not have been mounted * mounted. It is guaranteed to be mounted now either through
* (is either mounted automatically or via fstab entries) * automatically or via fstab entries.
*/ */
if (lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & (LXC_AUTO_CGROUP_MASK), handler) < 0) { ret = lxc_mount_auto_mounts(lxc_conf, lxc_conf->auto_mounts & LXC_AUTO_CGROUP_MASK, handler);
ERROR("failed to setup the automatic mounts for '%s'", name); if (ret < 0) {
ERROR("Failed to setup remaining automatic mounts");
return -1; return -1;
} }
ret = run_lxc_hooks(name, "mount", lxc_conf, NULL);
if (run_lxc_hooks(name, "mount", lxc_conf, NULL)) { if (run_lxc_hooks(name, "mount", lxc_conf, NULL)) {
ERROR("failed to run mount hooks for container '%s'.", name); ERROR("Failed to run mount hooks");
return -1; return -1;
} }
if (lxc_conf->autodev > 0) { if (lxc_conf->autodev > 0) {
if (run_lxc_hooks(name, "autodev", lxc_conf, NULL)) { ret = run_lxc_hooks(name, "autodev", lxc_conf, NULL);
ERROR("failed to run autodev hooks for container '%s'.", name); if (ret < 0) {
ERROR("Failed to run autodev hooks");
return -1; return -1;
} }
if (lxc_fill_autodev(&lxc_conf->rootfs)) { ret = lxc_fill_autodev(&lxc_conf->rootfs);
ERROR("failed to populate /dev in the container"); if (ret < 0) {
ERROR("Failed to populate \"/dev\"");
return -1; return -1;
} }
} }
if (!lxc_list_empty(&lxc_conf->mount_list) && setup_mount_entries(lxc_conf, &lxc_conf->rootfs, &lxc_conf->mount_list, name, lxcpath)) { if (!lxc_list_empty(&lxc_conf->mount_list)) {
ERROR("failed to setup the mount entries for '%s'", name); ret = setup_mount_entries(lxc_conf, &lxc_conf->rootfs,
return -1; &lxc_conf->mount_list, name, lxcpath);
if (ret < 0) {
ERROR("Failed to setup mount entries");
return -1;
}
} }
ret = lxc_setup_console(&lxc_conf->rootfs, &lxc_conf->console, ret = lxc_setup_console(&lxc_conf->rootfs, &lxc_conf->console,
...@@ -3380,23 +3405,25 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3380,23 +3405,25 @@ int lxc_setup(struct lxc_handler *handler)
ret = lxc_setup_dev_symlinks(&lxc_conf->rootfs); ret = lxc_setup_dev_symlinks(&lxc_conf->rootfs);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to setup /dev symlinks"); ERROR("Failed to setup \"/dev\" symlinks");
return -1; return -1;
} }
/* mount /proc if it's not already there */ ret = lxc_create_tmp_proc_mount(lxc_conf);
if (lxc_create_tmp_proc_mount(lxc_conf) < 0) { if (ret < 0) {
ERROR("failed to LSM mount proc for '%s'", name); ERROR("Failed to \"/proc\" LSMs");
return -1; return -1;
} }
if (setup_pivot_root(&lxc_conf->rootfs)) { ret = setup_pivot_root(&lxc_conf->rootfs);
ERROR("failed to set rootfs for '%s'", name); if (ret < 0) {
ERROR("Failed to pivot root into rootfs");
return -1; return -1;
} }
if (lxc_setup_devpts(lxc_conf)) { ret = lxc_setup_devpts(lxc_conf);
ERROR("failed to setup the new pts instance"); if (ret < 0) {
ERROR("Failed to setup new devpts instance");
return -1; return -1;
} }
...@@ -3404,35 +3431,42 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3404,35 +3431,42 @@ int lxc_setup(struct lxc_handler *handler)
if (ret < 0) if (ret < 0)
return -1; return -1;
if (setup_personality(lxc_conf->personality)) { ret = setup_personality(lxc_conf->personality);
ERROR("failed to setup personality"); if (ret < 0) {
ERROR("Failed to set personality");
return -1; return -1;
} }
/* set sysctl value to a path under /proc/sys as determined from the key. /* Set sysctl value to a path under /proc/sys as determined from the
* For e.g. net.ipv4.ip_forward translated to /proc/sys/net/ipv4/ip_forward. * key. For e.g. net.ipv4.ip_forward translated to
* /proc/sys/net/ipv4/ip_forward.
*/ */
if (!lxc_list_empty(&lxc_conf->sysctls)) { if (!lxc_list_empty(&lxc_conf->sysctls)) {
ret = setup_sysctl_parameters(&lxc_conf->sysctls); ret = setup_sysctl_parameters(&lxc_conf->sysctls);
if (ret < 0) if (ret < 0) {
ERROR("Failed to setup sysctl parameters");
return -1; return -1;
}
} }
if (!lxc_list_empty(&lxc_conf->keepcaps)) { if (!lxc_list_empty(&lxc_conf->keepcaps)) {
if (!lxc_list_empty(&lxc_conf->caps)) { if (!lxc_list_empty(&lxc_conf->caps)) {
ERROR("Container requests lxc.cap.drop and lxc.cap.keep: either use lxc.cap.drop or lxc.cap.keep, not both."); ERROR("Container requests lxc.cap.drop and "
"lxc.cap.keep: either use lxc.cap.drop or "
"lxc.cap.keep, not both");
return -1; return -1;
} }
if (dropcaps_except(&lxc_conf->keepcaps)) { if (dropcaps_except(&lxc_conf->keepcaps)) {
ERROR("failed to keep requested caps"); ERROR("Failed to keep capabilities");
return -1; return -1;
} }
} else if (setup_caps(&lxc_conf->caps)) { } else if (setup_caps(&lxc_conf->caps)) {
ERROR("failed to drop capabilities"); ERROR("Failed to drop capabilities");
return -1; return -1;
} }
NOTICE("Container \"%s\" is set up", name); NOTICE("The container \"%s\" is set up", name);
return 0; return 0;
} }
......
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