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

NixOS VM tests: Don't create a setgid group in vde_switch

Browse Source 
Nix no longer allows this for security reasons.

http://hydra.nixos.org/build/53993125
This commit is contained in:
Eelco Dolstra 2017-06-07 11:57:36 +02:00
parent 110e03897f
commit 0996ea8a68
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/test-driver/test-driver.pl
View File

@ -35,7 +35,7 @@ foreach my $vlan (split / /, $ENV{VLANS} || "") {
if ($pid == 0) {
dup2(fileno($pty->slave), 0);
dup2(fileno($stdoutW), 1);
exec "vde_switch -s $socket" or _exit(1);
exec "vde_switch -s $socket --dirmode 0700" or _exit(1);
}
close $stdoutW;
print $pty "version\n";

2
pkgs/build-support/vm/windows/controller/default.nix
View File

@ -185,7 +185,7 @@ let
MONITOR_SOCKET="$(pwd)/monitor"
WINVM_PIDFILE="$(pwd)/winvm.pid"
CTRLVM_PIDFILE="$(pwd)/ctrlvm.pid"
${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" &
${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" --dirmode 0700 &
echo 'alive?' | ${socat}/bin/socat - \
UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20
'';