clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-28 03:38:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5630 from rjnagal/libcontainer-fixes

Browse Source 
Check supplied hostname before using it.
This commit is contained in:
Michael Crosby
2014-05-06 09:49:52 -07:00
parent 7e3a1b6521 412324cfbe
commit 818648ff9f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/libcontainer/nsinit/init.go
+4 -2
View File
@@ -66,8 +66,10 @@ func Init(container *libcontainer.Container, uncleanRootfs, consolePath string,
if err := mount.InitializeMountNamespace(rootfs, consolePath, container); err != nil {
return fmt.Errorf("setup mount namespace %s", err)
}
if err := system.Sethostname(container.Hostname); err != nil {
return fmt.Errorf("sethostname %s", err)
if container.Hostname != "" {
if err := system.Sethostname(container.Hostname); err != nil {
return fmt.Errorf("sethostname %s", err)
}
}
runtime.LockOSThread()