Skip to content

Commit

Permalink
fix order in identifying amazon linux version (#1652)
Browse files Browse the repository at this point in the history
  • Loading branch information
wagde-orca committed Apr 21, 2023
1 parent 93d401c commit 333eae0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions scanner/redhatbase.go
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,6 @@ func detectRedhat(c config.ServerInfo) (bool, osTypeInterface) {
// Amazon Linux AMI release 2017.09
// Amazon Linux AMI release 2018.03
release = "1"
case strings.HasPrefix(r.Stdout, "Amazon Linux 2"), strings.HasPrefix(r.Stdout, "Amazon Linux release 2"):
// Amazon Linux 2 (Karoo)
// Amazon Linux release 2 (Karoo)
release = "2"
case strings.HasPrefix(r.Stdout, "Amazon Linux 2022"), strings.HasPrefix(r.Stdout, "Amazon Linux release 2022"):
// Amazon Linux 2022 (Amazon Linux)
// Amazon Linux release 2022 (Amazon Linux)
Expand All @@ -316,6 +312,10 @@ func detectRedhat(c config.ServerInfo) (bool, osTypeInterface) {
// Amazon Linux 2023 (Amazon Linux)
// Amazon Linux release 2023 (Amazon Linux)
release = "2023"
case strings.HasPrefix(r.Stdout, "Amazon Linux 2"), strings.HasPrefix(r.Stdout, "Amazon Linux release 2"):
// Amazon Linux 2 (Karoo)
// Amazon Linux release 2 (Karoo)
release = "2"
default:
fields := strings.Fields(r.Stdout)
if len(fields) == 5 {
Expand Down

0 comments on commit 333eae0

Please sign in to comment.