summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-03-25 16:55:02 -0700
committerAdin Scannell <ascannell@google.com>2020-04-08 10:00:14 -0700
commit94b793262d3c54b4c32fed83d2bd121069680d15 (patch)
treec89f8101c0a39d419f21793afbd38e9eb8f64840 /runsc/boot
parent71c7e24e5cb8641f4cb98b5fc848ae2033b29eac (diff)
Fix all copy locks violations.
This required minor restructuring of how system call tables were saved and restored, but it makes way more sense this way. Updates #2243
Diffstat (limited to 'runsc/boot')
-rw-r--r--runsc/boot/compat.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/boot/compat.go b/runsc/boot/compat.go
index 8995d678e..b7cfb35bf 100644
--- a/runsc/boot/compat.go
+++ b/runsc/boot/compat.go
@@ -65,7 +65,7 @@ func newCompatEmitter(logFD int) (*compatEmitter, error) {
if logFD > 0 {
f := os.NewFile(uintptr(logFD), "user log file")
- target := &log.MultiEmitter{c.sink, &log.K8sJSONEmitter{log.Writer{Next: f}}}
+ target := &log.MultiEmitter{c.sink, log.K8sJSONEmitter{&log.Writer{Next: f}}}
c.sink = &log.BasicLogger{Level: log.Info, Emitter: target}
}
return c, nil