mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #454 from mlaventure/libcontainer-pidns

Browse Source 
Move setns within nsexec
This commit is contained in:
Mrunal Patel
2016-02-29 15:34:19 -08:00
parent 5f8fd8e04e 6325ab96e7
commit b1872a068e
12 changed files with 951 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec.go
+4 -1
View File
@@ -593,7 +593,10 @@ func setupUserNamespace(spec *specs.LinuxSpec, config *configs.Config) error {
if len(spec.Linux.UIDMappings) == 0 {
return nil
}
config.Namespaces.Add(configs.NEWUSER, "")
// do not override the specified user namespace path
if config.Namespaces.PathOf(configs.NEWUSER) == "" {
config.Namespaces.Add(configs.NEWUSER, "")
}
create := func(m specs.IDMapping) configs.IDMap {
return configs.IDMap{
HostID: int(m.HostID),