From 27f496c1cebe65e2ab53d8f555d791303ac2dab7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Aug 2012 14:59:58 -0400
Subject: [PATCH] Make the VirtualBox guest services depend on /dev/vboxguest

Systemd #ftw
---
 modules/virtualisation/virtualbox-guest.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/virtualisation/virtualbox-guest.nix b/modules/virtualisation/virtualbox-guest.nix
index 8e09d79e3a4..e864c125176 100644
--- a/modules/virtualisation/virtualbox-guest.nix
+++ b/modules/virtualisation/virtualbox-guest.nix
@@ -41,7 +41,9 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
     jobs.virtualbox =
       { description = "VirtualBox service";
 
-        startOn = "started udev";
+        wantedBy = [ "multi-user.target" ];
+        requires = [ "dev-vboxguest.device" ];
+        after = [ "dev-vboxguest.device" ];
 
         exec = "${kernel.virtualboxGuestAdditions}/sbin/VBoxService --foreground";
       };
@@ -60,7 +62,7 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
       ''
         InputDevice "VBoxMouse"
       '';
-    
+
     services.xserver.displayManager.sessionCommands =
       ''
         PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver ]}:$PATH \
@@ -72,9 +74,12 @@ if (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) then
         # /dev/vboxuser is necessary for VBoxClient to work.  Maybe we
         # should restrict this to logged-in users.
         KERNEL=="vboxuser",  OWNER="root", GROUP="root", MODE="0666"
+
+        # Allow systemd dependencies on vboxguest.
+        KERNEL=="vboxguest", TAG+="systemd"
       '';
 
-    # Make the ACPI Shutdown command to do the right thing.    
+    # Make the ACPI Shutdown command to do the right thing.
     services.acpid.enable = true;
     services.acpid.powerEventCommands = "poweroff";
   };