conf: fix path/lxcpath mixups in tty setup

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> Fixes: 6947153d ("conf: use mknod() to create dummy mount target")

conf: fix path/lxcpath mixups in tty setup
0cf1cbf2 · Wolfgang Bumiller · Christian Brauner · 152c0dc8 · 0cf1cbf2
Unverified Commit 0cf1cbf2 authored Aug 20, 2018 by Wolfgang Bumiller Committed by Christian Brauner Aug 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

conf.c src/lxc/conf.c +4 -4

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -902,7 +902,7 @@ static int lxc_setup_ttys(struct lxc_conf *conf)
 			if (ret < 0 || (size_t)ret >= sizeof(lxcpath))
 				return -1;
-			ret = mknod(path, S_IFREG | 0000, 0);
+			ret = mknod(lxcpath, S_IFREG | 0000, 0);
 			if (ret < 0 && errno != EEXIST) {
 				SYSERROR("Failed to create \"%s\"", lxcpath);
 				return -1;
@@ -916,12 +916,12 @@ static int lxc_setup_ttys(struct lxc_conf *conf)
 			ret = mount(tty->name, lxcpath, "none", MS_BIND, 0);
 			if (ret < 0) {
-				WARN("Failed to bind mount \"%s\" onto \"%s\"",
+				SYSWARN("Failed to bind mount \"%s\" onto \"%s\"",
-				     tty->name, path);
+				     tty->name, lxcpath);
 				continue;
 			}
 			DEBUG("Bind mounted \"%s\" onto \"%s\"", tty->name,
-			      path);
+			      lxcpath);
 			ret = snprintf(lxcpath, sizeof(lxcpath), "%s/tty%d",
 				       ttydir, i + 1);