summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorSilvan Mosberger <infinisil@icloud.com>2019-01-12 20:41:13 +0100
committerGitHub <noreply@github.com>2019-01-12 20:41:13 +0100
commit497e6f1705107a7d60e400e3b6dd6df5ca8bcdba (patch)
treef03f6f18dd346c4498fba2cce70d65c79cda9c4a /nixos
parentad23ea312d37b8086ea62bd6be33c2c07e5a9963 (diff)
parent764f16461bd0046b1b264ba8bb700772a137b5a8 (diff)
downloadnixpkgs-497e6f1705107a7d60e400e3b6dd6df5ca8bcdba.tar
nixpkgs-497e6f1705107a7d60e400e3b6dd6df5ca8bcdba.tar.gz
nixpkgs-497e6f1705107a7d60e400e3b6dd6df5ca8bcdba.tar.bz2
nixpkgs-497e6f1705107a7d60e400e3b6dd6df5ca8bcdba.tar.lz
nixpkgs-497e6f1705107a7d60e400e3b6dd6df5ca8bcdba.tar.xz
nixpkgs-497e6f1705107a7d60e400e3b6dd6df5ca8bcdba.tar.zst
nixpkgs-497e6f1705107a7d60e400e3b6dd6df5ca8bcdba.zip
Merge pull request #51661 from eonpatapon/testing-hosts
test: set machines fqdn in /etc/hosts
Diffstat (limited to 'nixos')
-rw-r--r--nixos/lib/build-vms.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
index 024f4414ebe..a5580f4712e 100644
--- a/nixos/lib/build-vms.nix
+++ b/nixos/lib/build-vms.nix
@@ -83,6 +83,8 @@ rec {
                     (m': let config = (getAttr m' nodes).config; in
                       optionalString (config.networking.primaryIPAddress != "")
                         ("${config.networking.primaryIPAddress} " +
+                         optionalString (config.networking.domain != null)
+                           "${config.networking.hostName}.${config.networking.domain} " +
                          "${config.networking.hostName}\n"));
 
                   virtualisation.qemu.options =