From 7c873c2d00b7986f6d5ce342e201112dcf81ae55 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sun, 8 Jun 2025 23:54:55 +0530 Subject: [PATCH] Revert "nixos/lib/testing: fix network module" This reverts commit 35fb55d21b14456e25e677be57ca99d6ae031acf. --- nixos/lib/testing/network.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix index ce019bf27b4d..2a188e480ecb 100644 --- a/nixos/lib/testing/network.nix +++ b/nixos/lib/testing/network.nix @@ -13,7 +13,6 @@ let nameValuePair optionalAttrs optionalString - optionals range toLower types @@ -96,18 +95,16 @@ let name: config: let hostnames = - [ - "${config.networking.hostName}" - ] - ++ optionals (config.networking.domain != null) [ - "${config.networking.hostName}.${config.networking.domain}" - ]; + optionalString ( + config.networking.domain != null + ) "${config.networking.hostName}.${config.networking.domain} " + + "${config.networking.hostName}\n"; in optionalAttrs (config.networking.primaryIPAddress != "") { - "${config.networking.primaryIPAddress}" = hostnames; + "${config.networking.primaryIPAddress}" = [ hostnames ]; } // optionalAttrs (config.networking.primaryIPv6Address != "") { - "${config.networking.primaryIPv6Address}" = hostnames; + "${config.networking.primaryIPv6Address}" = [ hostnames ]; } ) nodes;