Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on the host.
User namespaces
---------------

There is an feature in the Linux kernel called
There is a feature in the Linux kernel called
[user namespaces](https://www.google.com/search?q=user+namespaces+site%3Ahttps%3A%2F%2Flwn.net)
which allows unprivileged users to use container features. Bubblewrap uses these to
build the sandbox, allowing any user to use the tool.
Expand Down
10 changes: 5 additions & 5 deletions bubblewrap.c
Original file line number Diff line number Diff line change
Expand Up @@ -2635,16 +2635,16 @@ main (int argc,
die ("--userns-block-fd requires --info-fd");

if (opt_userns_fd != -1 && opt_unshare_user)
die ("--userns not compatible --unshare-user");
die ("--userns is not compatible with --unshare-user");

if (opt_userns_fd != -1 && opt_unshare_user_try)
die ("--userns not compatible --unshare-user-try");
die ("--userns is not compatible with --unshare-user-try");

if (opt_disable_userns && !opt_unshare_user)
die ("--disable-userns requires --unshare-user");

if (opt_disable_userns && opt_userns_block_fd != -1)
die ("--disable-userns is not compatible with --userns-block-fd");
die ("--disable-userns is not compatible with --userns-block-fd");

/* We have to do this if we we're not root, so let's just DWIM */
if (getuid () != 0 && opt_userns_fd == -1)
Expand Down Expand Up @@ -2674,8 +2674,8 @@ main (int argc,
}

/* Debian lets you disable *unprivileged* user namespaces. However this is not
a problem if we're privileged, and if we're not opt_unshare_user is true
already, and there is not much we can do, its just a non-working setup. */
a problem if we're privileged, and if we're not then opt_unshare_user is true
already, and there is not much we can do, it's just a non-working setup. */

if (!disabled)
opt_unshare_user = true;
Expand Down
2 changes: 1 addition & 1 deletion bwrap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<refsect1><title>Description</title>
<para>
<command>bwrap</command> is a unprivileged low-level sandboxing tool. You
<command>bwrap</command> is an unprivileged low-level sandboxing tool. You
are unlikely to use it directly from the commandline, although that is possible.
</para>
<para>
Expand Down
2 changes: 1 addition & 1 deletion utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ fork_intermediate_child (void)
if (pid == -1)
die_with_error ("Can't fork for --pidns");

/* Parent is an process not needed */
/* The parent process is not needed */
if (pid != 0)
exit (0);
}
Expand Down
Loading