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

* mkOverrideTemplate -> mkOverride.

Browse Source 
svn path=/nixos/trunk/; revision=23743
This commit is contained in:
Eelco Dolstra 2010-09-13 11:33:05 +00:00
parent 6b2844c6b2
commit e871e84159
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/virtualisation/qemu-vm.nix
View File

@ -232,12 +232,12 @@ in
virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
# Mount the host filesystem via CIFS, and bind-mount the Nix store # Mount the host filesystem via CIFS, and bind-mount the Nix store
# of the host into our own filesystem. We use mkOverrideTemplate to allow # of the host into our own filesystem. We use mkOverride to allow
# this module to be applied to "normal" NixOS system configuration, # this module to be applied to "normal" NixOS system configuration,
# where the regular value for the `fileSystems' attribute should be # where the regular value for the `fileSystems' attribute should be
# disregarded for the purpose of building a VM test image (since # disregarded for the purpose of building a VM test image (since
# those filesystems don't exist in the VM). # those filesystems don't exist in the VM).
fileSystems = mkOverrideTemplate 50 {} fileSystems = mkOverride 50
[ { mountPoint = "/"; [ { mountPoint = "/";
device = "/dev/vda"; device = "/dev/vda";
} }
@ -259,7 +259,7 @@ in
# host filesystem and thus deadlocks the system. # host filesystem and thus deadlocks the system.
networking.useDHCP = false; networking.useDHCP = false;
networking.defaultGateway = mkOverrideTemplate 200 {} "10.0.2.2"; networking.defaultGateway = mkOverride 200 "10.0.2.2";
networking.nameservers = [ "10.0.2.3" ]; networking.nameservers = [ "10.0.2.3" ];
@ -287,9 +287,9 @@ in
# When building a regular system configuration, override whatever # When building a regular system configuration, override whatever
# video driver the host uses. # video driver the host uses.
services.xserver.videoDriver = mkOverrideTemplate 50 {} null; services.xserver.videoDriver = mkOverride 50 null;
services.xserver.videoDrivers = mkOverrideTemplate 50 {} [ "cirrus" "vesa" ]; services.xserver.videoDrivers = mkOverride 50 [ "cirrus" "vesa" ];
services.xserver.defaultDepth = mkOverrideTemplate 50 {} 0; services.xserver.defaultDepth = mkOverride 50 0;
services.xserver.monitorSection = services.xserver.monitorSection =
'' ''
# Set a higher refresh rate so that resolutions > 800x600 work. # Set a higher refresh rate so that resolutions > 800x600 work.
@ -300,5 +300,5 @@ in
services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0"; services.mingetty.ttys = ttys ++ optional (!cfg.graphics) "ttyS0";
# Wireless won't work in the VM. # Wireless won't work in the VM.
networking.enableWLAN = mkOverrideTemplate 50 {} false; networking.enableWLAN = mkOverride 50 false;
} }