Commit 1536227d authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Merge branch 'RHEL8PlusSupport-master-20220610' into 'master'

RHEL 8+ Support, master branch (2022.06.10)

See merge request !961
parents ba2d68ba d3dc0321
Pipeline #4080543 passed with stage
in 59 minutes and 18 seconds
......@@ -182,7 +182,8 @@ function( atlas_os_id os isValid )
elseif( ( _linuxId MATCHES "CentOS" ) OR
( _linuxId MATCHES "centos" ) )
set( _linuxShort "centos" )
elseif( _linuxId MATCHES "RedHat" )
elseif( ( _linuxId MATCHES "RedHat" ) OR
( _linuxId MATCHES "rhel" ) )
set( _linuxShort "rhel" )
elseif( _linuxId MATCHES "Debian" )
set( _linuxShort "debian" )
......
......@@ -135,7 +135,8 @@ function( lcg_os_id os isValid )
elseif( ( _lcgLinuxId MATCHES "CentOS" ) OR
( _lcgLinuxId MATCHES "centos" ) )
set( _linuxShort "centos" )
elseif( _lcgLinuxId MATCHES "RedHat" )
elseif( ( _lcgLinuxId MATCHES "RedHat" ) OR
( _lcgLinuxId MATCHES "rhel" ) )
set( _linuxShort "rhel" )
elseif( _lcgLinuxId MATCHES "Debian" )
set( _linuxShort "debian" )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment