diff options
| author | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 17:56:12 +0000 |
|---|---|---|
| committer | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 17:56:12 +0000 |
| commit | d941907d642c43fff6624b44d0589fd8eb3a5cdf (patch) | |
| tree | 003c1f5fdfe1f12a8a74fcca37a444554e834bbb /remoting/tools/me2me_virtual_host.py | |
| parent | 05dfd8a5b73617ce75a0d2a45347801e17ea5a95 (diff) | |
| download | chromium_src-d941907d642c43fff6624b44d0589fd8eb3a5cdf.zip chromium_src-d941907d642c43fff6624b44d0589fd8eb3a5cdf.tar.gz chromium_src-d941907d642c43fff6624b44d0589fd8eb3a5cdf.tar.bz2 | |
[Chromoting] Make the Linux add-user code avoid gksudo if there's no display.
BUG=155431
Review URL: https://chromiumcodereview.appspot.com/11092093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools/me2me_virtual_host.py')
| -rwxr-xr-x | remoting/tools/me2me_virtual_host.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index 4787372..8495efc 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -806,12 +806,14 @@ Web Store: https://chrome.google.com/remotedesktop""" return 0 if options.add_user: - command = ("sudo -k && gksudo --message " + sudo_command = "gksudo --message" if os.getenv("DISPLAY") else "sudo -p" + command = ("sudo -k && %(sudo)s " "\"Please enter your password to enable Chrome Remote Desktop\" " "-- sh -c " "\"groupadd -f %(group)s && gpasswd --add %(user)s %(group)s\"" % { 'group': CHROME_REMOTING_GROUP_NAME, - 'user': getpass.getuser() }) + 'user': getpass.getuser(), + 'sudo': sudo_command }) return os.system(command) >> 8 if options.host_version: |