From: Christian Brauner Date: Mon, 8 May 2017 17:43:58 +0000 (+0200) Subject: conf: non-functional changes lxc_setup() X-Git-Tag: lxc-2.1.0~139^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27245ff7280180c1a6719acf138f31cf02f93b6d;p=thirdparty%2Flxc.git conf: non-functional changes lxc_setup() Signed-off-by: Christian Brauner --- diff --git a/src/lxc/conf.c b/src/lxc/conf.c index e3a73d684..5f1820f26 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -1171,7 +1171,7 @@ static const struct lxc_devs lxc_devs[] = { { "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; char path[MAXPATHLEN]; @@ -4044,13 +4044,11 @@ int lxc_setup(struct lxc_handler *handler) } 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)) { ERROR("failed to run autodev hooks for container '%s'.", name); 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"); return -1; }