From fe3751df8a7daa0d3ec72bda4c4a5b098b1530c0 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Thu, 9 Nov 2017 20:27:33 +0100 Subject: [PATCH] nixos/network-interfaces: Add " around network interface names in assertion messages to avoid misinterpretations when the interface name contains a dot. --- nixos/modules/tasks/network-interfaces.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 1741d2c7e1f7..b7e85e402aa9 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -923,7 +923,9 @@ in assertions = (flip map interfaces (i: { assertion = i.subnetMask == null; - message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead."; + message = '' + The networking.interfaces."${i.name}".subnetMask option is defunct. Use prefixLength instead. + ''; })) ++ (flip map interfaces (i: { # With the linux kernel, interface name length is limited by IFNAMSIZ # to 16 bytes, including the trailing null byte. @@ -934,7 +936,9 @@ in ''; })) ++ (flip map slaveIfs (i: { assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null; - message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave."; + message = '' + The networking.interfaces."${i.name}" must not have any defined ips when it is a slave. + ''; })) ++ [ { assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);