From d9d6fb58e4f324a442866acd4a7445866ae9fbf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Feb 2012 20:10:53 +0000
Subject: [PATCH] * Prevent the VirtualBox guest additions from being restarted
   constantly by Upstart.  Also move the module to a better location.

svn path=/nixos/trunk/; revision=32565
---
 .../virtualbox.nix => virtualisation/virtualbox-guest.nix} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename modules/{services/misc/virtualbox.nix => virtualisation/virtualbox-guest.nix} (84%)

diff --git a/modules/services/misc/virtualbox.nix b/modules/virtualisation/virtualbox-guest.nix
similarity index 84%
rename from modules/services/misc/virtualbox.nix
rename to modules/virtualisation/virtualbox-guest.nix
index 573666cebb1..eecae8dc7b5 100644
--- a/modules/services/misc/virtualbox.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -1,4 +1,5 @@
-# VirtualBox server
+# Module for VirtualBox guests.
+
 { config, pkgs, ... }:
 
 with pkgs.lib;
@@ -32,7 +33,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ ];
+    environment.systemPackages = [ kernel.virtualboxGuestAdditions ];
 
     boot.extraModulePackages = [ kernel.virtualboxGuestAdditions ];
 
@@ -41,7 +42,7 @@ in
 
         startOn = "started udev";
 
-        exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService";
+        exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService --foreground";
       };
 
   };