summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-09-20 13:29:40 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-09-20 13:34:44 +0200
commit9f765f928bc91dc4b2523bb9f703d40fc663286a (patch)
treef822a7cf5c7a97da904b0ec1143cb845a7f06ceb
parentnbd: update to version 3.14 (diff)
downloadnixpkgs-9f765f928bc91dc4b2523bb9f703d40fc663286a.tar.gz
nixos/networking: Use type lines for localCommands
Using types.str doesn't work if you want to mkBefore/mkAfter across different module definitions, because it only allows for one definition for the same priority. This is especially useful if you deploy Hetzner machines via NixOps, because the physical specification already defines localCommands. Signed-off-by: aszlig <aszlig@redmoonstudios.org> (cherry picked from commit 97801380b05447e59e47ba97d93f6c6cfefd56e4)
-rw-r--r--nixos/modules/tasks/network-interfaces.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 0528012adfd8..57c82b6d9519 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -391,7 +391,7 @@ in
};
networking.localCommands = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
example = "text=anything; echo You can put $text here.";
description = ''