mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-03 07:45:50 +00:00
utils/apparmor/sandbox.py: detect if xpra is running before attach
This commit is contained in:
@@ -338,7 +338,19 @@ EndSection
|
|||||||
cmd(args)
|
cmd(args)
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
self.pids.append(listener_x)
|
self.pids.append(listener_x)
|
||||||
time.sleep(2) # FIXME: detect if running
|
|
||||||
|
started = False
|
||||||
|
for i in range(10): # 5 seconds to start
|
||||||
|
time.sleep(0.5)
|
||||||
|
rc, out = cmd(['xpra', 'list'])
|
||||||
|
if 'LIVE session at %s' % self.display in out:
|
||||||
|
started = True
|
||||||
|
break
|
||||||
|
|
||||||
|
if not started:
|
||||||
|
sys.stdout.flush()
|
||||||
|
self.cleanup()
|
||||||
|
raise AppArmorException("Could not start xpra (try again with -d)")
|
||||||
|
|
||||||
# Next, attach to xpra
|
# Next, attach to xpra
|
||||||
sys.stdout.flush()
|
sys.stdout.flush()
|
||||||
|
Reference in New Issue
Block a user