Unverified Commit bb826cfe by Christian Brauner Committed by Stéphane Graber

conf: non-functional changes lxc_setup()

parent b55e06be
...@@ -1112,7 +1112,7 @@ static const struct lxc_devs lxc_devs[] = { ...@@ -1112,7 +1112,7 @@ static const struct lxc_devs lxc_devs[] = {
{ "tty", S_IFCHR | S_IRWXU | S_IRWXG | S_IRWXO, 5, 0 }, { "tty", S_IFCHR | S_IRWXU | S_IRWXG | S_IRWXO, 5, 0 },
}; };
static int lxc_fill_autodev(const struct lxc_rootfs *rootfs, bool mount_console) static int lxc_fill_autodev(const struct lxc_rootfs *rootfs)
{ {
int ret; int ret;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
...@@ -3945,13 +3945,11 @@ int lxc_setup(struct lxc_handler *handler) ...@@ -3945,13 +3945,11 @@ int lxc_setup(struct lxc_handler *handler)
} }
if (lxc_conf->autodev > 0) { if (lxc_conf->autodev > 0) {
bool mount_console = lxc_conf->console.path && !strcmp(lxc_conf->console.path, "none");
if (run_lxc_hooks(name, "autodev", lxc_conf, lxcpath, NULL)) { if (run_lxc_hooks(name, "autodev", lxc_conf, lxcpath, NULL)) {
ERROR("failed to run autodev hooks for container '%s'.", name); ERROR("failed to run autodev hooks for container '%s'.", name);
return -1; return -1;
} }
if (lxc_fill_autodev(&lxc_conf->rootfs, mount_console)) { if (lxc_fill_autodev(&lxc_conf->rootfs)) {
ERROR("failed to populate /dev in the container"); ERROR("failed to populate /dev in the container");
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