Do not prevent docker from running when kernel detection fails

This commit is contained in:
Guillaume J. Charmes 2013-04-22 11:26:34 -07:00
parent acb546cd1b
commit 3514e47edc
1 changed files with 7 additions and 8 deletions

View File

@ -295,15 +295,14 @@ func NewRuntime() (*Runtime, error) {
return nil, err return nil, err
} }
k, err := GetKernelVersion() if k, err := GetKernelVersion(); err != nil {
if err != nil { log.Printf("WARNING: %s\n", err)
return nil, err } else {
}
runtime.kernelVersion = k runtime.kernelVersion = k
if CompareKernelVersion(k, &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 { if CompareKernelVersion(k, &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {
log.Printf("WARNING: You are running linux kernel version %s, which might be unstable running docker. Please upgrade your kernel to 3.8.0.", k.String()) log.Printf("WARNING: You are running linux kernel version %s, which might be unstable running docker. Please upgrade your kernel to 3.8.0.", k.String())
} }
}
if cgroupMemoryMountpoint, err := FindCgroupMountpoint("memory"); err != nil { if cgroupMemoryMountpoint, err := FindCgroupMountpoint("memory"); err != nil {
log.Printf("WARNING: %s\n", err) log.Printf("WARNING: %s\n", err)