From 9004f6dbe19e5119f9526cfa75a5314fc36c1132 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 17 Jun 2016 22:18:26 -0700 Subject: [PATCH] generate: Don't serialize Spec.Linux as an empty JSON object The "does the marshaled JSON look like '{}'?" check is a pretty cheap trick, but it was the easiest way I could think of for "is there anything useful in here?". Signed-off-by: W. Trevor King --- generate/generate.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/generate/generate.go b/generate/generate.go index 9e4705aaf..60d92adcd 100644 --- a/generate/generate.go +++ b/generate/generate.go @@ -196,6 +196,16 @@ func (g *Generator) Spec() *rspec.Spec { func (g *Generator) Save(w io.Writer, exportOpts ExportOptions) (err error) { var data []byte + if g.spec.Linux != nil { + buf, err := json.Marshal(g.spec.Linux) + if err != nil { + return err + } + if string(buf) == "{}" { + g.spec.Linux = nil + } + } + if exportOpts.Seccomp { data, err = json.MarshalIndent(g.spec.Linux.Seccomp, "", "\t") } else {