Skip to content

Commit 49aa23e

Browse files
authored
Merge pull request openstack#26 from ychen2u/clear_mix
Add DISTRO check for Clear Linux Mix images.
2 parents 8bc0538 + 337e04d commit 49aa23e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎functions-common‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ function GetDistro {
399399
DISTRO="xs${os_RELEASE%.*}"
400400
elif [[ "$os_VENDOR" =~ (kvmibm) ]]; then
401401
DISTRO="${os_VENDOR}${os_RELEASE::1}"
402-
elif [[ "$os_VENDOR" =~ (Clear_Linux_OS) ]]; then
402+
elif [[ "$os_VENDOR" =~ (Clear_Linux_OS) ]] || [[ "$os_VENDOR" =~ (Clear_Linux_Mix) ]]; then
403403
DISTRO="${os_CODENAME}"
404404
else
405405
# We can't make a good choice here. Setting a sensible DISTRO
@@ -439,7 +439,7 @@ function is_clearlinux {
439439
GetOSVersion
440440
fi
441441

442-
[[ "$os_VENDOR" = "Clear_Linux_OS" ]]
442+
[[ "$os_VENDOR" = "Clear_Linux_OS" ]] || [[ "$os_VENDOR" = "Clear_Linux_Mix" ]]
443443
}
444444

445445
# Determine if current distribution is an Oracle distribution

0 commit comments

Comments
 (0)