diff --git a/mk/install.sh b/mk/install.sh index 889f1f0..d547735 100755 --- a/mk/install.sh +++ b/mk/install.sh @@ -131,10 +131,10 @@ select_pkgs_rhel() rhel6|centos6|oracle6|scientific6|neokylin5|neokylin6|asianux4|turbo12) # No additional kernel package ;; - rhel7|centos7|oracle7|scientific7|neokylin7) + rhel7|centos7|oracle7|scientific7|neokylin7|cloudlinux7) # No additional kernel package ;; - rhel8|centos8|oracle8|scientific8|neokylin8) + rhel8|centos8|oracle8|scientific8|neokylin8|cloudlinux8) # No additional kernel package ;; alpine3*) @@ -513,7 +513,7 @@ install_coreos() case "${os_distro}" in rhel|centos|oracle|fedora) select_pkgs_rhel ;; scientific|neokylin|asianux|turbo) select_pkgs_rhel ;; - alpine) select_pkgs_rhel ;; + alpine|cloudlinux) select_pkgs_rhel ;; sles|"suse linux") select_pkgs_sles ;; debian|ubuntu|linx|yinhe) select_pkgs_debian ;; xe-ddk|xe-sdk) select_pkgs_xe ;; diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index 73d5d90..2d1173d 100755 --- a/mk/xe-linux-distribution +++ b/mk/xe-linux-distribution @@ -124,6 +124,11 @@ identify_redhat() # CentOS release 5 (Final) # CentOS Linux release 7.0.1406 (Core) + # distro=cloudlinux + # CloudLinux Server release 6.10 (Vladimir Lyakhov) + # CloudLinux Linux release 6.9 + # CloudLinux release 7.7 (Valery Bykovsky) + # distro=scientific # Scientific Linux release 6.5 (Carbon) @@ -148,6 +153,8 @@ identify_redhat() -e 's/^CentOS release \([0-9]*\)\.\([0-9]*\) (.*)/distro=centos;major=\1;minor=\2/gp;' \ -e 's/^CentOS release \([0-9]*\) (.*)/distro=centos;major=\1/gp;' \ -e 's/^CentOS Linux release \([0-9]*\)\.\([0-9]*\)\(\.[0-9]*\)\? (.*)/distro=centos;major=\1;minor=\2/gp;' \ + -e 's/^CloudLinux\( Linux|Server\)\? release \([0-9]*\)\.\([0-9]*\)\(\.[0-9]*\)\? (.*)/distro=cloudlinux;major=\2;minor=\1/gp;' \ + -e 's/^CloudLinux release \([0-9]*\)\.\([0-9]*\)\(\.[0-9]*\)\? (.*)/distro=cloudlinux;major=\1;minor=\2/gp;' \ -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\)\.\([0-9]*\) (.*)$/distro=oracle;major=\1;minor=\2;/gp;' \ -e 's/^Enterprise Linux Enterprise Linux .* release \([0-9]*\) (.*)$/distro=oracle;major=\1/gp;' \ -e 's/^Oracle Linux Server release \([0-9]*\)\.\([0-9]*\)$/distro=oracle;major=\1;minor=\2/gp;' \