diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-04 16:51:16 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-12-04 16:51:16 +0000 |
commit | 9ac3f5df9c29e35b38539c3dca753eacc9b1393d (patch) | |
tree | e35e0e6b14b6aa56f9e21e748adc2f8806c93af5 /scripts | |
parent | bcfe98acffbefea734f51523b386868ae443c111 (diff) |
* Propagate --max-silent-time to remote machines.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build-remote.pl.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index fe2fbaf89..76afccd35 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -23,8 +23,9 @@ use English '-no_match_vars'; my $loadIncreased = 0; -my ($amWilling, $localSystem, $neededSystem, $drvPath, $mustRun) = @ARGV; +my ($amWilling, $localSystem, $neededSystem, $drvPath, $mustRun, $maxSilentTime) = @ARGV; $mustRun = 0 unless defined $mustRun; +$maxSilentTime = 0 unless defined $maxSilentTime; sub sendReply { my $reply = shift; @@ -184,12 +185,15 @@ system("NIX_SSHOPTS=\"$sshOpts\" nix-copy-closure $hostName $maybeSign $drvPath print "BUILDING...\n"; +my $buildFlags = ""; +$buildFlags .= " --max-silent-time $maxSilentTime"; + # `-tt' forces allocation of a pseudo-terminal. This is required to # make the remote nix-store process receive a signal when the # connection dies. Without it, the remote process might continue to # run indefinitely (that is, until it next tries to write to # stdout/stderr). -system("ssh -tt $sshOpts $hostName 'nix-store -rvvK $drvPath'") == 0 +system("ssh -tt $sshOpts $hostName 'nix-store -rvvK $buildFlags $drvPath'") == 0 or die "remote build on $hostName failed: $?"; print "REMOTE BUILD DONE: $drvPath on $hostName\n"; |