From 074af5906e7d71e53fe6db5023f17fb3e4d3bda8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 15 Nov 2012 22:55:00 +0100 Subject: [PATCH] Use new-style fileSystems --- tests/installer.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/installer.nix b/tests/installer.nix index 8b695ae5a18..dd52e817c1d 100644 --- a/tests/installer.nix +++ b/tests/installer.nix @@ -49,7 +49,7 @@ let boot.loader.grub.extraConfig = "serial; terminal_output.serial"; boot.initrd.kernelModules = [ "ext3" "ext4" "xfs" "virtio_console" ]; - fileSystems = [ ${fileSystems} ]; + ${fileSystems} swapDevices = [ { label = "swap"; } ]; environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; @@ -58,16 +58,12 @@ let rootFS = '' - { mountPoint = "/"; - device = "/dev/disk/by-label/nixos"; - } + fileSystems."/".device = "/dev/disk/by-label/nixos"; ''; bootFS = '' - { mountPoint = "/boot"; - device = "/dev/disk/by-label/boot"; - } + fileSystems."/boot".device = "/dev/disk/by-label/boot"; '';