From 59824ca6708d009561ccaae65d4c327224ef18ce Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Mon, 22 Apr 2013 11:39:56 -0700
Subject: [PATCH] Make the kernel version detection more generic
 Upstream-commit: 4ac3b803b9b7d0db1840a12f3332034938eb9550 Component: engine

---
 components/engine/utils.go | 43 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/components/engine/utils.go b/components/engine/utils.go
index a039ca6eb6..8f9e84f2b8 100644
--- a/components/engine/utils.go
+++ b/components/engine/utils.go
@@ -407,7 +407,12 @@ type KernelVersionInfo struct {
 
 // FIXME: this doens't build on Darwin
 func GetKernelVersion() (*KernelVersionInfo, error) {
-	var uts syscall.Utsname
+	var (
+		uts                  syscall.Utsname
+		flavor               string
+		kernel, major, minor int
+		err                  error
+	)
 
 	if err := syscall.Uname(&uts); err != nil {
 		return nil, err
@@ -422,31 +427,35 @@ func GetKernelVersion() (*KernelVersionInfo, error) {
 	}
 
 	tmp := strings.SplitN(string(release), "-", 2)
-	if len(tmp) != 2 {
-		return nil, fmt.Errorf("Unrecognized kernel version")
-	}
 	tmp2 := strings.SplitN(tmp[0], ".", 3)
-	if len(tmp2) != 3 {
-		return nil, fmt.Errorf("Unrecognized kernel version")
+
+	if len(tmp2) > 0 {
+		kernel, err = strconv.Atoi(tmp2[0])
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	kernel, err := strconv.Atoi(tmp2[0])
-	if err != nil {
-		return nil, err
+	if len(tmp2) > 1 {
+		major, err = strconv.Atoi(tmp2[1])
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	major, err := strconv.Atoi(tmp2[1])
-	if err != nil {
-		return nil, err
+	if len(tmp2) > 2 {
+		minor, err = strconv.Atoi(tmp2[2])
+		if err != nil {
+			return nil, err
+		}
 	}
 
-	minor, err := strconv.Atoi(tmp2[2])
-	if err != nil {
-		return nil, err
+	if len(tmp) == 2 {
+		flavor = tmp[1]
+	} else {
+		flavor = ""
 	}
 
-	flavor := tmp[1]
-
 	return &KernelVersionInfo{
 		Kernel: kernel,
 		Major:  major,