Browse Source

Make kernel detection work without suffix

Guillaume J. Charmes 12 years ago
parent
commit
c05c91ca3b
2 changed files with 8 additions and 0 deletions
  1. 4 0
      getKernelVersion_darwin.go
  2. 4 0
      getKernelVersion_linux.go

+ 4 - 0
getKernelVersion_darwin.go

@@ -1,5 +1,9 @@
 package docker
 
+import (
+	"fmt"
+)
+
 func getKernelVersion() (*KernelVersionInfo, error) {
 	return nil, fmt.Errorf("Kernel version detection is not available on darwin")
 }

+ 4 - 0
getKernelVersion_linux.go

@@ -1,6 +1,7 @@
 package docker
 
 import (
+	"bytes"
 	"strconv"
 	"strings"
 	"syscall"
@@ -26,6 +27,9 @@ func getKernelVersion() (*KernelVersionInfo, error) {
 		i++
 	}
 
+	// Remove the \x00 from the release for Atoi to parse correctly
+	release = release[:bytes.IndexByte(release, 0)]
+
 	tmp := strings.SplitN(string(release), "-", 2)
 	tmp2 := strings.SplitN(tmp[0], ".", 3)