public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new-style fileSystems

Browse Source
This commit is contained in:
Eelco Dolstra 2012-11-15 22:55:00 +01:00
parent 1f401a0e35
commit 074af5906e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/installer.nix
View File

@ -49,7 +49,7 @@ let
boot.loader.grub.extraConfig = "serial; terminal_output.serial"; boot.loader.grub.extraConfig = "serial; terminal_output.serial";
boot.initrd.kernelModules = [ "ext3" "ext4" "xfs" "virtio_console" ]; boot.initrd.kernelModules = [ "ext3" "ext4" "xfs" "virtio_console" ];
fileSystems = [ ${fileSystems} ]; ${fileSystems}
swapDevices = [ { label = "swap"; } ]; swapDevices = [ { label = "swap"; } ];
environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ];
@ -58,16 +58,12 @@ let
rootFS = rootFS =
'' ''
{ mountPoint = "/"; fileSystems."/".device = "/dev/disk/by-label/nixos";
device = "/dev/disk/by-label/nixos";
}
''; '';
bootFS = bootFS =
'' ''
{ mountPoint = "/boot"; fileSystems."/boot".device = "/dev/disk/by-label/boot";
device = "/dev/disk/by-label/boot";
}
''; '';