kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #21299 from allencloud/handle-kernel-version-error-in-version-api 

handle kernel version error in version api
This commit is contained in:
Vincent Demeester 2016-03-18 18:07:48 +01:00
parent a30332e705 73046cb8d8
commit ea0025a7e1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/info.go
View File

@ -141,9 +141,13 @@ func (daemon *Daemon) SystemVersion() types.Version {
Experimental: utils.ExperimentalBuild(), Experimental: utils.ExperimentalBuild(),
} }
if kernelVersion, err := kernel.GetKernelVersion(); err == nil { kernelVersion := "<unknown>"
v.KernelVersion = kernelVersion.String() if kv, err := kernel.GetKernelVersion(); err != nil {
logrus.Warnf("Could not get kernel version: %v", err)
} else {
kernelVersion = kv.String()
} }
v.KernelVersion = kernelVersion
return v return v
} }