diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-27 17:28:46 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-27 17:28:46 +0100 |
| commit | 024de57e7b1918a617685b65a0c5c45ee4592e47 (patch) | |
| tree | 2f0a9168b4569650619f334b597733ae10216b66 /krebs/3modules/setuid.nix | |
| parent | acd5d7cceeeb96c182a963ba0c564821a36c8938 (diff) | |
| parent | 8c859335a879c515a1415bc8b15b5cb7eb519efc (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/setuid.nix')
| -rw-r--r-- | krebs/3modules/setuid.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/krebs/3modules/setuid.nix b/krebs/3modules/setuid.nix index 1137788d8..cfb8382e8 100644 --- a/krebs/3modules/setuid.nix +++ b/krebs/3modules/setuid.nix @@ -46,6 +46,7 @@ let check = x: isString x && match "[0-7][0-7][0-7][0-7]" x != null; + merge = mergeOneOption; }; }; activate = mkOption { |