summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-06-06 21:27:50 +0200
committermakefu <github@syntax-fehler.de>2016-06-06 21:27:50 +0200
commitd587575deb7d6d3c94f684a7b6f6a6a2da0db247 (patch)
tree71dc6d19487bdbc2451a6711e220a7000023c4db /krebs/3modules
parent7bbf87d9a4923f15cc04847ad762e4279ee752bf (diff)
parentbaa20586b875e5b6bd600cf731f15d2251d05c95 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/setuid.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix
index cfb8382e8..65a4abe1c 100644
--- a/krebs/3modules/setuid.nix
+++ b/krebs/3modules/setuid.nix
@@ -20,6 +20,10 @@ let
type = types.filename;
default = config._module.args.name;
};
+ envp = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ };
filename = mkOption {
type = mkOptionType {
# TODO unyuck string and merge with toC
@@ -57,7 +61,7 @@ let
};
config.activate = let
src = pkgs.execve config.name {
- inherit (config) filename;
+ inherit (config) envp filename;
};
dst = "${wrapperDir}/${config.name}";
in ''
[cgit] Unable to lock slot /tmp/cgit/ed300000.lock: No such file or directory (2)