Merge branch 'master' into 3644-arv-mount-projects
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 8 Sep 2014 19:07:05 +0000 (15:07 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 8 Sep 2014 19:07:05 +0000 (15:07 -0400)
1  2 
sdk/cli/bin/crunch-job

index 94865a11cf346a4abbeb1a3f080475bc1d1cfc24,0ba32b05883ad8a565e4b694407049c39fa40ae7..a2c55120836c62c356f1b1985ee34d6983fb7239
@@@ -656,8 -656,10 +656,10 @@@ for (my $todo_ptr = 0; $todo_ptr <= $#j
      if ($build_script)
      {
        $build_script_to_send = $build_script;
+       $command .=
+         "&& perl -";
      }
 -    $command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
 +    $command .= "&& exec arv-mount --by-id --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
      if ($docker_hash)
      {
        $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$ENV{TASK_WORK}/docker.cid -poll=10000 ";