diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-08-04 03:03:24 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-08-04 03:03:24 +0200 |
| commit | 86b695a18e2a228b88387246107340a1bf6ae275 (patch) | |
| tree | 0475095b25de830a35fb1965dbbfacf520cd5fdd | |
| parent | a26edf0f77b670e231001815858cb2348d8a381f (diff) | |
| download | nixlib-86b695a18e2a228b88387246107340a1bf6ae275.tar nixlib-86b695a18e2a228b88387246107340a1bf6ae275.tar.gz nixlib-86b695a18e2a228b88387246107340a1bf6ae275.tar.bz2 nixlib-86b695a18e2a228b88387246107340a1bf6ae275.tar.lz nixlib-86b695a18e2a228b88387246107340a1bf6ae275.tar.xz nixlib-86b695a18e2a228b88387246107340a1bf6ae275.tar.zst nixlib-86b695a18e2a228b88387246107340a1bf6ae275.zip | |
vbox-guest: Remove all references to sbin/.
Using $storepath/sbin is deprecated according to commit 98cedb3, so let's avoid putting anything in .../sbin for the guest additions. This is a continuation of the initial commit done by @ctheune at 1fb1360, which unfortunately broke VM tests and only changed the path of the mount.vboxsf helper. With this commit, the VM test is fixed and I've also verified on my machine that it is indeed working again. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-guest.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/virtualbox.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/default.nix | 6 |
3 files changed, 5 insertions, 7 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" ]; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index f94d219aba60..4895eb134dc1 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let #!${pkgs.stdenv.shell} -xe export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" - ${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService + ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService ${(attrs.vmScript or (const "")) pkgs} i=0 @@ -39,7 +39,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let ]; boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" + copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf" copy_bin_and_libs "${pkgs.utillinux}/bin/unshare" ${(attrs.extraUtilsCommands or (const "")) pkgs} ''; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ac447fd50d30..6bf0ef2e8258 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -87,10 +87,8 @@ stdenv.mkDerivation { sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all # Install binaries - mkdir -p $out/bin - install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf - mkdir -p $out/sbin - install -m 755 sbin/VBoxService $out/sbin + install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf + install -D -m 755 sbin/VBoxService $out/bin/VBoxService mkdir -p $out/bin install -m 755 bin/VBoxClient $out/bin |