summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-08-04 04:00:09 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-08-04 04:00:09 +0200
commit07edb2483d35946cd3b299b4c113a554b2b1a2e0 (patch)
treee421d4e5971b05e555e58f589574eae5e62a67f6 /nixos/modules
parent6c50714222a4f4bf46dab8fcd206c3e4c3f61715 (diff)
parent86b695a18e2a228b88387246107340a1bf6ae275 (diff)
downloadnixlib-07edb2483d35946cd3b299b4c113a554b2b1a2e0.tar
nixlib-07edb2483d35946cd3b299b4c113a554b2b1a2e0.tar.gz
nixlib-07edb2483d35946cd3b299b4c113a554b2b1a2e0.tar.bz2
nixlib-07edb2483d35946cd3b299b4c113a554b2b1a2e0.tar.lz
nixlib-07edb2483d35946cd3b299b4c113a554b2b1a2e0.tar.xz
nixlib-07edb2483d35946cd3b299b4c113a554b2b1a2e0.tar.zst
nixlib-07edb2483d35946cd3b299b4c113a554b2b1a2e0.zip
Merge branch 'vboxguest-sbin-removal'.
This removes all references to .../sbin for the guest additions and also
installs all binaries to .../bin instead (so no more .../sbin).

The main motivation for doing this is commit 98cedb3 (which
unfortunately had to be reverted in a9f2e10) and pull request #9063,
where the latter is an initial effort to move mount.vboxsf to .../bin
instead of .../sbin.

The commit I made afterwards is finishing the removal of .../sbin
entirely.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/virtualisation/virtualbox-guest.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index a0e4bd558e05..6c4014fc4a1e 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -54,7 +54,7 @@ in
 
         unitConfig.ConditionVirtualization = "oracle";
 
-        serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground";
+        serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground";
       };
 
     services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];