alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #5302 from ambrop72/virtualbox-network-interface

Browse source 
virtualbox: Unbreak the nixos module.
This commit is contained in:
Jaka Hudoklin 2014-12-12 00:30:34 +01:00
parent 8b512261be 65393ca8d3
commit c96df1fece
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/programs/virtualbox-host.nix
View file

@ -16,7 +16,7 @@ in
}; };
}; };
config = mkIf config.services.virtualboxHost.enable { config = mkIf config.services.virtualboxHost.enable (mkMerge [{
boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ];
boot.extraModulePackages = [ virtualbox ]; boot.extraModulePackages = [ virtualbox ];
environment.systemPackages = [ virtualbox ]; environment.systemPackages = [ virtualbox ];
@ -51,7 +51,7 @@ in
''; '';
# Since we lack the right setuid binaries, set up a host-only network by default. # Since we lack the right setuid binaries, set up a host-only network by default.
} // mkIf config.services.virtualboxHost.addNetworkInterface { } (mkIf config.services.virtualboxHost.addNetworkInterface {
systemd.services."vboxnet0" = systemd.services."vboxnet0" =
{ description = "VirtualBox vboxnet0 Interface"; { description = "VirtualBox vboxnet0 Interface";
requires = [ "dev-vboxnetctl.device" ]; requires = [ "dev-vboxnetctl.device" ];
@ -73,5 +73,5 @@ in
}; };
networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ];
}; })]);
} }