Merge pull request #298 from Mashimiao/generate-fix-remove-all-parse

generate: fix *-remove-all parse bug
opencontainers · Jan 10, 2017 · c91307b · c91307b
2 parents 015f898 + 346850a
commit c91307b
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/cmd/oci-runtime-tool/generate.go b/cmd/oci-runtime-tool/generate.go
@@ -260,11 +260,7 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		}
 	}
 
-	privileged := false
-	if context.IsSet("privileged") {
-		privileged = context.Bool("privileged")
-	}
-	g.SetupPrivileged(privileged)
+	g.SetupPrivileged(context.Bool("privileged"))
 
 	if context.IsSet("cap-add") {
 		addCaps := context.StringSlice("cap-add")
@@ -482,7 +478,7 @@ func setupSpec(g *generate.Generator, context *cli.Context) error {
 		}
 	}
 
-	if context.IsSet("rlimits-remove-all") {
+	if context.Bool("rlimits-remove-all") {
 		g.ClearProcessRlimits()
 	}
 
@@ -680,7 +676,7 @@ func addSeccomp(context *cli.Context, g *generate.Generator) error {
 		}
 	}
 
-	if context.IsSet("seccomp-remove-all") {
+	if context.Bool("seccomp-remove-all") {
 		err := g.RemoveAllSeccompRules()
 		if err != nil {
 			return err