diff options
author | lassulus <lass@blue.r> | 2018-10-23 15:47:06 +0200 |
---|---|---|
committer | lassulus <lass@blue.r> | 2018-10-23 15:47:06 +0200 |
commit | 24f4e8dcf0eca55378fa018a9ed980625222653d (patch) | |
tree | 852db8ea3dbec5973f9bf8056ae9f981271b889d /lass/3modules | |
parent | fc799f61f17014e61f5bd602c5e44f7412660c28 (diff) |
l xjail: use sudo again until fixed
Diffstat (limited to 'lass/3modules')
-rw-r--r-- | lass/3modules/xjail.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lass/3modules/xjail.nix b/lass/3modules/xjail.nix index 5b450ed42..974e11c6e 100644 --- a/lass/3modules/xjail.nix +++ b/lass/3modules/xjail.nix @@ -120,10 +120,13 @@ with import <stockholm/lib>; ${pkgs.coreutils}/bin/kill $WM_PID ${pkgs.coreutils}/bin/kill $XEPHYR_PID ''; + # TODO fix xephyr which doesn't honor resizes anymore sudo_ = pkgs.writeDash "${cfg.name}-sudo" (if cfg.vglrun then '' /var/run/wrappers/bin/sudo -u ${cfg.name} -i ${vglrun_} "$@" '' else '' - /var/run/wrappers/bin/sudo -u ${cfg.name} -i env DISPLAY=:${cfg.display} ${cfg.script} "$@" + #/var/run/wrappers/bin/sudo -u ${cfg.name} -i env DISPLAY=:${cfg.display} ${cfg.script} "$@" + /var/run/wrappers/bin/sudo -u ${cfg.name} -i ${cfg.script} "$@" + ''); vglrun_ = pkgs.writeDash "${cfg.name}-vglrun" '' DISPLAY=:${cfg.display} ${pkgs.virtualgl}/bin/vglrun ${cfg.extraVglrunArgs} ${cfg.script} "$@" @@ -163,7 +166,7 @@ with import <stockholm/lib>; lass.xjail-bins = mapAttrs' (name: cfg: nameValuePair name (pkgs.writeScriptBin cfg.name '' - ${scripts.${name}.existing} "$@" + ${scripts.${name}.sudo} "$@" '') ) config.lass.xjail; }; |