From 86b695a18e2a228b88387246107340a1bf6ae275 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 4 Aug 2015 03:03:24 +0200 Subject: 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 --- nixos/tests/virtualbox.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/tests') 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} ''; -- cgit 1.4.1