From 6ee99af4520cc33f7079189353b025f9f3e1f4a9 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Fri, 25 Mar 2016 17:48:05 -0700 Subject: [PATCH] Fixing the exec script check to run within the chroot --- client/driver/executor/checks_test.go | 2 +- client/driver/executor/executor_posix.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/client/driver/executor/checks_test.go b/client/driver/executor/checks_test.go index 2449c74bb..fd15476cf 100644 --- a/client/driver/executor/checks_test.go +++ b/client/driver/executor/checks_test.go @@ -58,7 +58,7 @@ func TestExecScriptCheckWithIsolation(t *testing.T) { id: "foo", cmd: "/bin/echo", args: []string{"hello", "world"}, - taskDir: "/tmp", + taskDir: ctx.AllocDir.TaskDirs["web"], FSIsolation: true, } diff --git a/client/driver/executor/executor_posix.go b/client/driver/executor/executor_posix.go index 4be468b2c..07c688084 100644 --- a/client/driver/executor/executor_posix.go +++ b/client/driver/executor/executor_posix.go @@ -12,6 +12,12 @@ import ( func (e *UniversalExecutor) LaunchSyslogServer(ctx *ExecutorContext) (*SyslogServerState, error) { e.ctx = ctx + + // configuring the task dir + if err := e.configureTaskDir(); err != nil { + return nil, err + } + e.syslogChan = make(chan *logging.SyslogMessage, 2048) l, err := e.getListener(e.ctx.PortLowerBound, e.ctx.PortUpperBound) if err != nil {