jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5630 from rjnagal/libcontainer-fixes 

Check supplied hostname before using it.
This commit is contained in:
Michael Crosby 2014-05-06 09:49:52 -07:00
parent 6c1bf629ef 2499d43325
commit 68de553fca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nsinit/init.go
View File

@ -66,8 +66,10 @@ func Init(container *libcontainer.Container, uncleanRootfs, consolePath string,
if err := mount.InitializeMountNamespace(rootfs, consolePath, container); err != nil { if err := mount.InitializeMountNamespace(rootfs, consolePath, container); err != nil {
return fmt.Errorf("setup mount namespace %s", err) return fmt.Errorf("setup mount namespace %s", err)
} }
if err := system.Sethostname(container.Hostname); err != nil { if container.Hostname != "" {
return fmt.Errorf("sethostname %s", err) if err := system.Sethostname(container.Hostname); err != nil {
return fmt.Errorf("sethostname %s", err)
}
} }
runtime.LockOSThread() runtime.LockOSThread()