commit 0996ea8a68096b596b27678dfdd0f4acde7b92de · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

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

Nix no longer allows this for security reasons.

http://hydra.nixos.org/build/53993125

Eelco Dolstra 8 years ago 0996ea8a 110e0389

+2 -2

2 changed files

expand all

unified split

nixos

lib

test-driver

test-driver.pl

pkgs

build-support

windows

controller

default.nix

+1 -1

nixos/lib/test-driver/test-driver.pl

··· 35 if ($pid == 0) { 36 dup2(fileno($pty->slave), 0); 37 dup2(fileno($stdoutW), 1); 38 - exec "vde_switch -s $socket" or _exit(1); 39 } 40 close $stdoutW; 41 print $pty "version\n";

··· 35 if ($pid == 0) { 36 dup2(fileno($pty->slave), 0); 37 dup2(fileno($stdoutW), 1); 38 + exec "vde_switch -s $socket --dirmode 0700" or _exit(1); 39 } 40 close $stdoutW; 41 print $pty "version\n";

+1 -1

pkgs/build-support/vm/windows/controller/default.nix

··· 185 MONITOR_SOCKET="$(pwd)/monitor" 186 WINVM_PIDFILE="$(pwd)/winvm.pid" 187 CTRLVM_PIDFILE="$(pwd)/ctrlvm.pid" 188 - ${vde2}/bin/vde_switch -s "$QEMU_VDE_SOCKET" & 189 echo 'alive?' | ${socat}/bin/socat - \ 190 UNIX-CONNECT:$QEMU_VDE_SOCKET/ctl,retry=20 191 '';

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