Browse code

Merge "Introduce Virtuozzo distribution"

Jenkins authored on 2016/03/07 23:09:03
Showing 1 changed files
... ...
@@ -380,7 +380,8 @@ function GetDistro {
380 380
         DISTRO="sle${os_RELEASE%.*}"
381 381
     elif [[ "$os_VENDOR" =~ (Red.*Hat) || \
382 382
         "$os_VENDOR" =~ (CentOS) || \
383
-        "$os_VENDOR" =~ (OracleLinux) ]]; then
383
+        "$os_VENDOR" =~ (OracleLinux) || \
384
+        "$os_VENDOR" =~ (Virtuozzo) ]]; then
384 385
         # Drop the . release as we assume it's compatible
385 386
         # XXX re-evaluate when we get RHEL10
386 387
         DISTRO="rhel${os_RELEASE::1}"
... ...
@@ -421,7 +422,7 @@ function is_fedora {
421 421
 
422 422
     [ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
423 423
         [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \
424
-        [ "$os_VENDOR" = "CloudLinux" ] || [ "$os_VENDOR" = "kvmibm" ]
424
+        [ "$os_VENDOR" = "Virtuozzo" ] || [ "$os_VENDOR" = "kvmibm" ]
425 425
 }
426 426
 
427 427