diff options
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 2 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-guest.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-image.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 7178c4b1dfb7..a3b763a8a946 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -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;" } diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index ea7d9763ce64..2b2d8e8cec58 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -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! diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index a5a4db797877..a0e4bd558e05 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -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; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 106b269d9e1f..8232f6e50dfc 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -128,6 +128,6 @@ in { boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; - services.virtualbox.enable = true; + services.virtualboxGuest.enable = true; }; } diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index e268c046ac63..19e8f14ebf1c 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -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 |