Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/bin/rainbow-run
diff options
context:
space:
mode:
Diffstat (limited to 'bin/rainbow-run')
-rwxr-xr-xbin/rainbow-run10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/rainbow-run b/bin/rainbow-run
index 7f5241c..70ba823 100755
--- a/bin/rainbow-run
+++ b/bin/rainbow-run
@@ -35,7 +35,7 @@ def main():
parser.add_option('-i', '--id', default=[], action='append',
help="ID of shared-data group.")
parser.add_option('-o', '--option', default=[], action='append',
- help="Options: video, audio, serial, constant-uid, xephyr, network.")
+ help="Options: video, audio, serial, constant-uid, x11, network.")
parser.add_option('-p', '--permissions', default=None,
help="Location of a permissions.info file.")
parser.add_option('-u', '--user', default=None,
@@ -75,8 +75,8 @@ def main():
def check_groups(opts):
return [grp.getgrnam(g)[2] for g in opts.group]
- def check_xephyr(opts):
- return 'xephyr' in opts.option
+ def check_x11(opts):
+ return 'x11' in opts.option
def check_constant_uid(opts):
return 'constant-uid' in opts.option
@@ -125,12 +125,12 @@ def main():
data_ids = check_data_ids(opts)
assistant = check_assistant(opts)
- xephyr = check_xephyr(opts)
+ x11 = check_x11(opts)
resume_uid = check_resume_user(opts)
if resume_uid: report(1, "resuming uid (%d)", resume_uid)
- args = (report, spool, env, argv, cwd, pset, safe_fds, uid, gid, resume_uid, groups, data_ids, assistant, xephyr)
+ args = (report, spool, env, argv, cwd, pset, safe_fds, uid, gid, resume_uid, groups, data_ids, assistant, x11)
report(1, 'rainbow:\n%s', pformat(args))
unshare(CLONE_NEWNS)