Browse code

Do not prevent docker from running when kernel detection fails

Guillaume J. Charmes authored on 2013/04/23 03:26:34
Showing 1 changed files
... ...
@@ -295,14 +295,13 @@ func NewRuntime() (*Runtime, error) {
295 295
 		return nil, err
296 296
 	}
297 297
 
298
-	k, err := GetKernelVersion()
299
-	if err != nil {
300
-		return nil, err
301
-	}
302
-	runtime.kernelVersion = k
303
-
304
-	if CompareKernelVersion(k, &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {
305
-		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())
298
+	if k, err := GetKernelVersion(); err != nil {
299
+		log.Printf("WARNING: %s\n", err)
300
+	} else {
301
+		runtime.kernelVersion = k
302
+		if CompareKernelVersion(k, &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}) < 0 {
303
+			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())
304
+		}
306 305
 	}
307 306
 
308 307
 	if cgroupMemoryMountpoint, err := FindCgroupMountpoint("memory"); err != nil {