diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-08-04 04:00:09 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-08-04 04:00:09 +0200 |
| commit | 07edb2483d35946cd3b299b4c113a554b2b1a2e0 (patch) | |
| tree | e421d4e5971b05e555e58f589574eae5e62a67f6 /nixos/tests | |
| parent | 6c50714222a4f4bf46dab8fcd206c3e4c3f61715 (diff) | |
| parent | 86b695a18e2a228b88387246107340a1bf6ae275 (diff) | |
| download | nixlib-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/tests')
| -rw-r--r-- | nixos/tests/virtualbox.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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} ''; |