public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vbox-guest: Remove all references to sbin/.

Browse Source 
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>
This commit is contained in:
aszlig
2015-08-04 03:03:24 +02:00
parent a26edf0f77
commit 86b695a18e
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/virtualbox-guest.nix
+1 -1
View File
@@ -54,7 +54,7 @@ in
unitConfig.ConditionVirtualization = "oracle"; 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" ]; services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
nixos/tests/virtualbox.nix
+2 -2
View File
@@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
#!${pkgs.stdenv.shell} -xe #!${pkgs.stdenv.shell} -xe
export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin"
${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService
${(attrs.vmScript or (const "")) pkgs} ${(attrs.vmScript or (const "")) pkgs}
i=0 i=0
@@ -39,7 +39,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
]; ];
boot.initrd.extraUtilsCommands = '' 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" copy_bin_and_libs "${pkgs.utillinux}/bin/unshare"
${(attrs.extraUtilsCommands or (const "")) pkgs} ${(attrs.extraUtilsCommands or (const "")) pkgs}
''; '';
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+2 -4
View File
@@ -87,10 +87,8 @@ stdenv.mkDerivation {
sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
# Install binaries # Install binaries
mkdir -p $out/bin install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf
install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf install -D -m 755 sbin/VBoxService $out/bin/VBoxService
mkdir -p $out/sbin
install -m 755 sbin/VBoxService $out/sbin
mkdir -p $out/bin mkdir -p $out/bin
install -m 755 bin/VBoxClient $out/bin install -m 755 bin/VBoxClient $out/bin