pyrox.dev / nixpkgs
lol
fork atom

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>

aszlig 86b695a1 a26edf0f

+5 -7
unified split
+1 -1
nixos/modules/virtualisation/virtualbox-guest.nix
··· 54 55 unitConfig.ConditionVirtualization = "oracle"; 56 57 - serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/sbin/VBoxService VBoxService --foreground"; 58 }; 59 60 services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
··· 54 55 unitConfig.ConditionVirtualization = "oracle"; 56 57 + serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground"; 58 }; 59 60 services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" ];
+2 -2
nixos/tests/virtualbox.nix
··· 8 #!${pkgs.stdenv.shell} -xe 9 export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" 10 11 - ${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService 12 ${(attrs.vmScript or (const "")) pkgs} 13 14 i=0 ··· 39 ]; 40 41 boot.initrd.extraUtilsCommands = '' 42 - copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" 43 copy_bin_and_libs "${pkgs.utillinux}/bin/unshare" 44 ${(attrs.extraUtilsCommands or (const "")) pkgs} 45 '';
··· 8 #!${pkgs.stdenv.shell} -xe 9 export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" 10 11 + ${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/VBoxService 12 ${(attrs.vmScript or (const "")) pkgs} 13 14 i=0 ··· 39 ]; 40 41 boot.initrd.extraUtilsCommands = '' 42 + copy_bin_and_libs "${pkgs.linuxPackages.virtualboxGuestAdditions}/bin/mount.vboxsf" 43 copy_bin_and_libs "${pkgs.utillinux}/bin/unshare" 44 ${(attrs.extraUtilsCommands or (const "")) pkgs} 45 '';
+2 -4
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
··· 87 sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all 88 89 # Install binaries 90 - mkdir -p $out/bin 91 - install -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf 92 - mkdir -p $out/sbin 93 - install -m 755 sbin/VBoxService $out/sbin 94 95 mkdir -p $out/bin 96 install -m 755 bin/VBoxClient $out/bin
··· 87 sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all 88 89 # Install binaries 90 + install -D -m 4755 lib/VBoxGuestAdditions/mount.vboxsf $out/bin/mount.vboxsf 91 + install -D -m 755 sbin/VBoxService $out/bin/VBoxService 92 93 mkdir -p $out/bin 94 install -m 755 bin/VBoxClient $out/bin