summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-02-14 01:32:22 +0100
committermakefu <github@syntax-fehler.de>2018-02-14 01:32:22 +0100
commit397a1c89319cce2c0f37ef5eb308e40954727108 (patch)
treee9e761372f7fd1f3e4dcc878a600e357246c6906 /makefu
parent00a4ff15cd413e9eaa82a10b344c176bafdb00c1 (diff)
ma {vbob,sdev}.r: disable vbox guest extensions for now
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/sdev/config.nix6
-rw-r--r--makefu/1systems/vbob/config.nix6
2 files changed, 9 insertions, 3 deletions
diff --git a/makefu/1systems/sdev/config.nix b/makefu/1systems/sdev/config.nix
index 38c044be4..3e9548aa1 100644
--- a/makefu/1systems/sdev/config.nix
+++ b/makefu/1systems/sdev/config.nix
@@ -6,7 +6,9 @@
[ # Include the results of the hardware scan.
<stockholm/makefu>
(toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
- (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
+ { ## Guest Extensions are currently broken
+ # virtualisation.virtualbox.guest.enable = true;
+ }
<stockholm/makefu/2configs/main-laptop.nix>
# <secrets/extra-hosts.nix>
@@ -50,7 +52,7 @@
fileSystems."/media/share" = {
fsType = "vboxsf";
device = "share";
- options = [ "rw" "uid=9001" "gid=9001" ];
+ options = [ "rw" "uid=9001" "gid=9001" "nofail" ];
};
}
diff --git a/makefu/1systems/vbob/config.nix b/makefu/1systems/vbob/config.nix
index ffd9deaee..24d42a69b 100644
--- a/makefu/1systems/vbob/config.nix
+++ b/makefu/1systems/vbob/config.nix
@@ -8,8 +8,12 @@
{
imports = [<stockholm/makefu/2configs/fs/single-partition-ext4.nix> ];
boot.loader.grub.device = "/dev/sda";
- virtualisation.virtualbox.guest.enable = true;
}
+
+ { ## Virtualbox guest is broken on newer kernel
+ # virtualisation.virtualbox.guest.enable = true;
+ }
+
# {
# imports = [
# <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>