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

nixos: Rename virtualbox to virtualboxGuest.

Browse Source 
Especially new users could be confused by this, so we're now marking
services.virtualbox.enable as obsolete and defaulting to
services.virtualboxGuest.enable instead. I believe this now makes it
clear, that this option is for guest additions only.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-11-27 18:07:54 +01:00
parent 77ff279f27
commit 444987193e
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/tools/nixos-generate-config.pl
View File

@ -235,7 +235,7 @@ chomp $virt;
# Check if we're a VirtualBox guest. If so, enable the guest
# additions.
if ($virt eq "oracle") {
push @attrs, "services.virtualbox.enable = true;"
push @attrs, "services.virtualboxGuest.enable = true;"
}

3
nixos/modules/rename.nix
View File

@ -107,6 +107,9 @@ in zipModules ([]
++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ]
# VirtualBox
++ obsolete [ "services" "virtualbox" "enable" ] [ "services" "virtualboxGuest" "enable" ]
# KDE
++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]
# ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] # !!! doesn't work!

4
nixos/modules/virtualisation/virtualbox-guest.nix
View File

@ -6,7 +6,7 @@ with lib;
let
cfg = config.services.virtualbox;
cfg = config.services.virtualboxGuest;
kernel = config.boot.kernelPackages;
in
@ -17,7 +17,7 @@ in
options = {
services.virtualbox = {
services.virtualboxGuest = {
enable = mkOption {
default = false;

2
nixos/modules/virtualisation/virtualbox-image.nix
View File

@ -128,6 +128,6 @@ in {
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
services.virtualbox.enable = true;
services.virtualboxGuest.enable = true;
};
}

2
pkgs/build-support/grsecurity/default.nix
View File

@ -84,7 +84,7 @@ let
let boolToKernOpt = b: if b then "y" else "n";
# Disable RANDSTRUCT under virtualbox, as it has some kind of
# breakage with the vbox guest drivers
#randstruct = optionalString config.services.virtualbox.enable
#randstruct = optionalString config.services.virtualboxGuest.enable
# "GRKERNSEC_RANDSTRUCT n";
# Disable restricting links under the testing kernel, as something