This removes Oracle Linux 6 support ("OracleLinux") which, like RHEL6,
is now unsupported. "OracleServer" matches Oracle Linux 7.
Change-Id: I35b1c7d0b103c509283dba0f6551453e7d8ac4cc
Closes-Bug: #1568634
| ... | ... |
@@ -380,7 +380,7 @@ function GetDistro {
|
| 380 | 380 |
DISTRO="sle${os_RELEASE%.*}"
|
| 381 | 381 |
elif [[ "$os_VENDOR" =~ (Red.*Hat) || \ |
| 382 | 382 |
"$os_VENDOR" =~ (CentOS) || \ |
| 383 |
- "$os_VENDOR" =~ (OracleLinux) || \ |
|
| 383 |
+ "$os_VENDOR" =~ (OracleServer) || \ |
|
| 384 | 384 |
"$os_VENDOR" =~ (Virtuozzo) ]]; then |
| 385 | 385 |
# Drop the . release as we assume it's compatible |
| 386 | 386 |
# XXX re-evaluate when we get RHEL10 |
| ... | ... |
@@ -427,7 +427,7 @@ function is_oraclelinux {
|
| 427 | 427 |
GetOSVersion |
| 428 | 428 |
fi |
| 429 | 429 |
|
| 430 |
- [ "$os_VENDOR" = "OracleLinux" ] |
|
| 430 |
+ [ "$os_VENDOR" = "OracleServer" ] |
|
| 431 | 431 |
} |
| 432 | 432 |
|
| 433 | 433 |
|
| ... | ... |
@@ -441,7 +441,7 @@ function is_fedora {
|
| 441 | 441 |
|
| 442 | 442 |
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ |
| 443 | 443 |
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \ |
| 444 |
- [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \ |
|
| 444 |
+ [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleServer" ] || \ |
|
| 445 | 445 |
[ "$os_VENDOR" = "Virtuozzo" ] || [ "$os_VENDOR" = "kvmibm" ] |
| 446 | 446 |
} |
| 447 | 447 |
|