alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'vboxguest-sbin-removal'.

Browse source 
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.
This commit is contained in:
aszlig 2015-08-04 04:00:09 +02:00
parent 6c50714222 86b695a18e
commit 07edb2483d
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/virtualisation/virtualbox-guest.nix
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" ];

4
nixos/tests/virtualbox.nix
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}
''; '';

5
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file

@ -87,9 +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/sbin install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf
install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/sbin/mount.vboxsf install -D -m 755 sbin/VBoxService $out/bin/VBoxService
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