]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
conf: non-functional changes lxc_setup()
authorChristian Brauner <christian.brauner@ubuntu.com>
Mon, 8 May 2017 17:43:58 +0000 (19:43 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Tue, 9 May 2017 21:16:01 +0000 (23:16 +0200)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/conf.c

index e3a73d684c890aab70c7389022538ca2de816f2f..5f1820f260a61265168e443628d17964e3a9a85d 100644 (file)
@@ -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;
                }