diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-28 02:26:44 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-28 02:26:44 +0100 |
| commit | db72d5911f1556d3b1cfbe8f1a2d8f6765728952 (patch) | |
| tree | ab12aafd2994c265cd4fd604e554b2e8db2da021 /krebs/3modules/setuid.nix | |
| parent | 64a1dc64a3a7daf57e1ebc677e35c4dc89d9c36b (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 { |