| Index: remoting/host/linux/linux_me2me_host.py
|
| diff --git a/remoting/host/linux/linux_me2me_host.py b/remoting/host/linux/linux_me2me_host.py
|
| index e24965c8654532805ac13ddef590410f4667c6b2..01b09cdf6e5fb391816af4531c8fe2695d5507a1 100755
|
| --- a/remoting/host/linux/linux_me2me_host.py
|
| +++ b/remoting/host/linux/linux_me2me_host.py
|
| @@ -395,8 +395,7 @@ class Desktop:
|
|
|
| # Wait for X to be active.
|
| for _test in range(20):
|
| - proc = subprocess.Popen("xdpyinfo", env=self.child_env, stdout=devnull)
|
| - _pid, retcode = os.waitpid(proc.pid, 0)
|
| + retcode = subprocess.call("xdpyinfo", env=self.child_env, stdout=devnull)
|
| if retcode == 0:
|
| break
|
| time.sleep(0.5)
|
| @@ -411,9 +410,8 @@ class Desktop:
|
| # Reconfigure the X server to use "evdev" keymap rules. The X server must
|
| # be started with -noreset otherwise it'll reset as soon as the command
|
| # completes, since there are no other X clients running yet.
|
| - proc = subprocess.Popen("setxkbmap -rules evdev", env=self.child_env,
|
| - shell=True)
|
| - _pid, retcode = os.waitpid(proc.pid, 0)
|
| + retcode = subprocess.call("setxkbmap -rules evdev", env=self.child_env,
|
| + shell=True)
|
| if retcode != 0:
|
| logging.error("Failed to set XKB to 'evdev'")
|
|
|
|
|