specconv: avoid skipping gidmappings applied when uidmappings is empty

Ma Shimiao · Ma Shimiao · commit 57edfbbaf2c5 · 2017-11-30T16:24:36.000+08:00
Signed-off-by: Ma Shimiao &lt;mashimiao.fnst@cn.fujitsu.com&gt;
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -618,9 +618,6 @@ func setupUserNamespace(spec *specs.Spec, config *configs.Config) error {
 		}
 	}
 	if spec.Linux != nil {
-		if len(spec.Linux.UIDMappings) == 0 {
-			return nil
-		}
 		for _, m := range spec.Linux.UIDMappings {
 			config.UidMappings = append(config.UidMappings, create(m))
 		}

Original file line number	Diff line number	Diff line change
`@@ -618,9 +618,6 @@ func setupUserNamespace(spec specs.Spec, config configs.Config) error {`
`618`	`618`	`}`
`619`	`619`	`}`
`620`	`620`	`if spec.Linux != nil {`
`621`		`- if len(spec.Linux.UIDMappings) == 0 {`
`622`		`- return nil`
`623`		`- }`
`624`	`621`	`for _, m := range spec.Linux.UIDMappings {`
`625`	`622`	`config.UidMappings = append(config.UidMappings, create(m))`
`626`	`623`	`}`