Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed error / help message when x11docker is run as root #1

Merged
merged 1 commit into from
Oct 10, 2016
Merged

Fixed error / help message when x11docker is run as root #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 x11docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ s0_active_plugins = core;composite;opengl;decor;resize;move;
the new X server would get root privileges, too. To run docker, you will be
prompted for your root password only for this one command.
On systems without a root password, like Ubuntu, choose option '-s, --sudo'
If you want to allow root to run x11docker, use option '-r, --root'"
If you want to allow root to run x11docker, use option '--root'"
fi
else
if [ "0" = "$(id -u)" ] ; then GETROOT="" ; fi # if running as root and it is allowed, then disable password prompt
Expand Down