about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2019-05-12 23:42:42 +0200
committerGitHub <noreply@github.com>2019-05-12 23:42:42 +0200
commitf2ac54d086d924f7818ecb090c96d7e80a521073 (patch)
treea670a51eb11eaaab091899ca7b8b9cf7a3b956d9 /pkgs/os-specific
parent0c7704df0ca0754d59745f386701181d7cb55f52 (diff)
parentc6934f347a891dacfacdfe96994ff4cc5e63a1f8 (diff)
downloadnixlib-f2ac54d086d924f7818ecb090c96d7e80a521073.tar
nixlib-f2ac54d086d924f7818ecb090c96d7e80a521073.tar.gz
nixlib-f2ac54d086d924f7818ecb090c96d7e80a521073.tar.bz2
nixlib-f2ac54d086d924f7818ecb090c96d7e80a521073.tar.lz
nixlib-f2ac54d086d924f7818ecb090c96d7e80a521073.tar.xz
nixlib-f2ac54d086d924f7818ecb090c96d7e80a521073.tar.zst
nixlib-f2ac54d086d924f7818ecb090c96d7e80a521073.zip
kernel: Disable VirtualBox guest modules. (#60938)
kernel: Disable VirtualBox guest modules.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5711e019f95b..58a2429d47c6 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -426,6 +426,12 @@ let
 
       VFIO_PCI_VGA = mkIf stdenv.is64bit yes;
 
+      # VirtualBox guest drivers in the kernel conflict with the ones in the
+      # official additions package and prevent the vboxsf module from loading,
+      # so disable them for now.
+      VBOXGUEST = option no;
+      DRM_VBOXVIDEO = option no;
+
     } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({
       XEN = option yes;