1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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
commit ea0025a7e1

View file

@ -141,9 +141,13 @@ func (daemon *Daemon) SystemVersion() types.Version {
Experimental: utils.ExperimentalBuild(),
}
if kernelVersion, err := kernel.GetKernelVersion(); err == nil {
v.KernelVersion = kernelVersion.String()
kernelVersion := "<unknown>"
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
}