@@ -6,6 +6,7 @@ import (

 	"crypto/sha256"

 	"encoding/hex"

 	"encoding/json"

+	"errors"

 	"fmt"

 	"index/suffixarray"

 	"io"

@@ -556,15 +557,11 @@ type KernelVersionInfo struct {

 }

 func (k *KernelVersionInfo) String() string {

-	flavor := ""

-	if len(k.Flavor) > 0 {

-		flavor = fmt.Sprintf("-%s", k.Flavor)

-	}

-	return fmt.Sprintf("%d.%d.%d%s", k.Kernel, k.Major, k.Minor, flavor)

+	return fmt.Sprintf("%d.%d.%d%s", k.Kernel, k.Major, k.Minor, k.Flavor)

 }

 // Compare two KernelVersionInfo struct.

-// Returns -1 if a < b, = if a == b, 1 it a > b

+// Returns -1 if a < b, 0 if a == b, 1 it a > b

 func CompareKernelVersion(a, b *KernelVersionInfo) int {

 	if a.Kernel < b.Kernel {

 		return -1

@@ -613,41 +610,15 @@ func GetKernelVersion() (*KernelVersionInfo, error) {

 func ParseRelease(release string) (*KernelVersionInfo, error) {

 	var (

-		flavor               string

-		kernel, major, minor int

-		err                  error

+		kernel, major, minor, parsed int

+		flavor                       string

 	)

-	tmp := strings.SplitN(release, "-", 2)

-	tmp2 := strings.Split(tmp[0], ".")

-

-	if len(tmp2) > 0 {

-		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

-		}

-	}

-

-	if len(tmp2) > 2 {

-		// Removes "+" because git kernels might set it

-		minorUnparsed := strings.Trim(tmp2[2], "+")

-		minor, err = strconv.Atoi(minorUnparsed)

-		if err != nil {

-			return nil, err

-		}

-	}

-

-	if len(tmp) == 2 {

-		flavor = tmp[1]

-	} else {

-		flavor = ""

+	// Ignore error from Sscanf to allow an empty flavor.  Instead, just

+	// make sure we got all the version numbers.

+	parsed, _ = fmt.Sscanf(release, "%d.%d.%d%s", &kernel, &major, &minor, &flavor)

+	if parsed < 3 {

+		return nil, errors.New("Can't parse kernel version " + release)

 	}

 	return &KernelVersionInfo{

@@ -237,16 +237,16 @@ func TestCompareKernelVersion(t *testing.T) {

 		&KernelVersionInfo{Kernel: 2, Major: 6, Minor: 0},

 		1)

 	assertKernelVersion(t,

-		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "0"},

-		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "16"},

+		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},

+		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},

 		0)

 	assertKernelVersion(t,

 		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 5},

 		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},

 		1)

 	assertKernelVersion(t,

-		&KernelVersionInfo{Kernel: 3, Major: 0, Minor: 20, Flavor: "25"},

-		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "0"},

+		&KernelVersionInfo{Kernel: 3, Major: 0, Minor: 20},

+		&KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0},

 		-1)

 }

@@ -407,13 +407,17 @@ func assertParseRelease(t *testing.T, release string, b *KernelVersionInfo, resu

 	if r := CompareKernelVersion(a, b); r != result {

 		t.Fatalf("Unexpected kernel version comparison result. Found %d, expected %d", r, result)

 	}

+	if a.Flavor != b.Flavor {

+		t.Fatalf("Unexpected parsed kernel flavor.  Found %s, expected %s", a.Flavor, b.Flavor)

+	}

 }

 func TestParseRelease(t *testing.T) {

 	assertParseRelease(t, "3.8.0", &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0}, 0)

-	assertParseRelease(t, "3.4.54.longterm-1", &KernelVersionInfo{Kernel: 3, Major: 4, Minor: 54}, 0)

-	assertParseRelease(t, "3.4.54.longterm-1", &KernelVersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: "1"}, 0)

-	assertParseRelease(t, "3.8.0-19-generic", &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "19-generic"}, 0)

+	assertParseRelease(t, "3.4.54.longterm-1", &KernelVersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)

+	assertParseRelease(t, "3.4.54.longterm-1", &KernelVersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)

+	assertParseRelease(t, "3.8.0-19-generic", &KernelVersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "-19-generic"}, 0)

+	assertParseRelease(t, "3.12.8tag", &KernelVersionInfo{Kernel: 3, Major: 12, Minor: 8, Flavor: "tag"}, 0)

 }

 func TestParsePortMapping(t *testing.T) {