diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-11-27 18:07:54 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-11-27 18:42:22 +0100 |
commit | 444987193e47aad56f7e78684a11f8ded3b830a5 (patch) | |
tree | d41ecbae561ce9096d1b614f857510ff120a129a /nixos | |
parent | 77ff279f2767cf1f28eed03a1f93e5df54c99bf5 (diff) | |
download | nixlib-444987193e47aad56f7e78684a11f8ded3b830a5.tar nixlib-444987193e47aad56f7e78684a11f8ded3b830a5.tar.gz nixlib-444987193e47aad56f7e78684a11f8ded3b830a5.tar.bz2 nixlib-444987193e47aad56f7e78684a11f8ded3b830a5.tar.lz nixlib-444987193e47aad56f7e78684a11f8ded3b830a5.tar.xz nixlib-444987193e47aad56f7e78684a11f8ded3b830a5.tar.zst nixlib-444987193e47aad56f7e78684a11f8ded3b830a5.zip |
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>
Diffstat (limited to 'nixos')
-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 |
4 files changed, 7 insertions, 4 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; }; } |