summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-07-23 21:56:09 +0200
committerLennart Poettering <lennart@poettering.net>2015-07-23 21:56:09 +0200
commit0ed5c799a6ac69b15d11e107994fec1fc49b40fd (patch)
tree41222bd92fc43ffdf0dd81c09a0ed7a6efe1f8dd
parentc5f44880ca35bc0246ddf90cbf2af45b10e4a4d5 (diff)
parent3dce891505f7b2bef4d492203125da765e128b1b (diff)
Merge pull request #670 from floppym/ptsuid
nspawn: Don't pass uid mount option for devpts
-rw-r--r--src/nspawn/nspawn.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 3428109da4..65b9a5071b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1785,15 +1785,13 @@ static int setup_pts(const char *dest) {
#ifdef HAVE_SELINUX
if (arg_selinux_apifs_context)
(void) asprintf(&options,
- "newinstance,ptmxmode=0666,mode=620,uid=" UID_FMT ",gid=" GID_FMT ",context=\"%s\"",
- arg_uid_shift,
+ "newinstance,ptmxmode=0666,mode=620,gid=" GID_FMT ",context=\"%s\"",
arg_uid_shift + TTY_GID,
arg_selinux_apifs_context);
else
#endif
(void) asprintf(&options,
- "newinstance,ptmxmode=0666,mode=620,uid=" UID_FMT ",gid=" GID_FMT,
- arg_uid_shift,
+ "newinstance,ptmxmode=0666,mode=620,gid=" GID_FMT,
arg_uid_shift + TTY_GID);
if (!options)