nixos: Rename virtualbox to virtualboxGuest.

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>

aszlig 44498719 77ff279f

Changed files
+8 -5
nixos
pkgs
build-support
grsecurity
+1 -1
nixos/modules/installer/tools/nixos-generate-config.pl
···
# Check if we're a VirtualBox guest. If so, enable the guest
# additions.
if ($virt eq "oracle") {
-
push @attrs, "services.virtualbox.enable = true;"
}
···
# Check if we're a VirtualBox guest. If so, enable the guest
# additions.
if ($virt eq "oracle") {
+
push @attrs, "services.virtualboxGuest.enable = true;"
}
+3
nixos/modules/rename.nix
···
++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "xbmc" ]
# KDE
++ deprecated [ "kde" "extraPackages" ] [ "environment" "kdePackages" ]
# ++ obsolete [ "environment" "kdePackages" ] [ "environment" "systemPackages" ] # !!! doesn't work!
···
++ 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!
+2 -2
nixos/modules/virtualisation/virtualbox-guest.nix
···
let
-
cfg = config.services.virtualbox;
kernel = config.boot.kernelPackages;
in
···
options = {
-
services.virtualbox = {
enable = mkOption {
default = false;
···
let
+
cfg = config.services.virtualboxGuest;
kernel = config.boot.kernelPackages;
in
···
options = {
+
services.virtualboxGuest = {
enable = mkOption {
default = false;
+1 -1
nixos/modules/virtualisation/virtualbox-image.nix
···
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
-
services.virtualbox.enable = true;
};
}
···
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
+
services.virtualboxGuest.enable = true;
};
}
+1 -1
pkgs/build-support/grsecurity/default.nix
···
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
# "GRKERNSEC_RANDSTRUCT n";
# Disable restricting links under the testing kernel, as something
···
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.virtualboxGuest.enable
# "GRKERNSEC_RANDSTRUCT n";
# Disable restricting links under the testing kernel, as something