summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2016-05-06 12:29:40 +0200
committerColin Walters (automation) <walters+githubbot@verbum.org>2016-05-06 11:10:28 +0000
commit055f58c2453e66ad1a69207a602be3a028a7aa8f (patch)
tree8702c50a96a0c8dcadb8960cafd3286c57faabc7
parent8a53e3a6647fe3fcece7a6ebb2a02e75a1155484 (diff)
downloadbubblewrap-055f58c2453e66ad1a69207a602be3a028a7aa8f.tar.gz
Fix using --dev unprivileged (without --proc)
If using --dev we need a special workaround to make it possible to mount devpts. Unfortunately the workaround was erronously enabled if you added --proc, not --dev. This moves this check to the right place. To test, try: ./bwrap --ro-bind / / --dev /dev true Closes: #48 Approved by: cgwalters
-rw-r--r--bubblewrap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bubblewrap.c b/bubblewrap.c
index b0bf0f7..084ce06 100644
--- a/bubblewrap.c
+++ b/bubblewrap.c
@@ -939,7 +939,6 @@ parse_args (int *argcp,
op = setup_op_new (SETUP_MOUNT_PROC);
op->dest = argv[1];
- opt_needs_devpts = TRUE;
argv += 1;
argc -= 1;
@@ -978,6 +977,7 @@ parse_args (int *argcp,
op = setup_op_new (SETUP_MOUNT_DEV);
op->dest = argv[1];
+ opt_needs_devpts = TRUE;
argv += 1;
argc -= 1;