Skip to content

Commit

Permalink
loosen .el7 check
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Goldstein committed Aug 4, 2016
1 parent 5bb3c31 commit 1bd0010
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion container/docker/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func ensureThinLsKernelVersion(kernelVersion string) error {
}

// Certain RHEL/Centos 7.x kernels have a backport to fix the corruption bug
if !strings.Contains(kernelVersion, ".el7.") {
if !strings.Contains(kernelVersion, ".el7") {
// not a RHEL 7.x kernel - won't work
return fmt.Errorf("kernel version 4.4.0 or later is required to use thin_ls - you have %q", kernelVersion)
}
Expand Down
1 change: 1 addition & 0 deletions container/docker/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func TestEnsureThinLsKernelVersion(t *testing.T) {
{"4.6.4-301.fc24.x86_64", ""},
{"3.10.0-327.22.2.el7.x86_64", `RHEL/Centos 7.x kernel version 3.10.0-366 or later is required to use thin_ls - you have "3.10.0-327.22.2.el7.x86_64"`},
{"3.10.0-366.el7.x86_64", ""},
{"3.10.0-366.el7_3.x86_64", ""},
{"3.10.0.el7.abc", `unable to determine RHEL/Centos 7.x kernel release from "3.10.0.el7.abc"`},
{"3.10.0-abc.el7.blarg", `error parsing release "abc": strconv.ParseInt: parsing "abc": invalid syntax`},
{"3.10.0-367.el7.x86_64", ""},
Expand Down

0 comments on commit 1bd0010

Please sign in to comment.