Check for existing ptmx symlink

It's OK, if /dev/ptmx points to /dev/pts/ptmx via a symlink. Signed-off-by: Sven Wegener <sven.wegener@stealer.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Check for existing ptmx symlink
57d6d671 · Sven Wegener · Daniel Lezcano · 9781dae8 · 57d6d671
Commit 57d6d671 authored May 23, 2011 by Sven Wegener Committed by Daniel Lezcano May 27, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

conf.c src/lxc/conf.c +5 -0

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -736,6 +736,8 @@ int setup_pivot_root(const struct lxc_rootfs *rootfs)

 static int setup_pts(int pts)
 {
+	char target[PATH_MAX];
+
 	if (!pts)
 		return 0;

@@ -757,6 +759,9 @@ static int setup_pts(int pts)
 		return -1;
 	}

+	if (realpath("/dev/ptmx", target) && !strcmp(target, "/dev/pts/ptmx"))
+		goto out;
+
 	/* fallback here, /dev/pts/ptmx exists just mount bind */
 	if (mount("/dev/pts/ptmx", "/dev/ptmx", "none", MS_BIND, 0)) {
 		SYSERROR("mount failed '/dev/pts/ptmx'->'/dev/ptmx'");