From 2961851389288f10867375b28b5238b3fa61f2ed Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Wed, 16 Oct 2019 13:04:45 +0200 Subject: [PATCH] Add support for CloudLinux, which is based on CentOS Based on https://github.com/xenserver/xe-guest-utilities/pull/72 Refs https://github.com/xcp-ng/xcp/issues/77 --- mk/install.sh | 5 +++-- mk/xe-linux-distribution | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mk/install.sh b/mk/install.sh index 886e140..32706dc 100755 --- a/mk/install.sh +++ b/mk/install.sh @@ -132,10 +132,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|oracle8|centos8|rocky8) + rhel8|oracle8|centos8|rocky8|cloudlinux8) # No additional kernel package ;; rhel3|fedora*) @@ -517,6 +517,7 @@ install_coreos() case "${os_distro}" in rhel|centos|oracle|fedora|rocky) select_pkgs_rhel ;; scientific|neokylin|asianux|turbo) select_pkgs_rhel ;; + cloudlinux) select_pkgs_rhel ;; sles|"suse linux") select_pkgs_sles ;; debian|ubuntu|linx|yinhe|Gooroom) select_pkgs_debian ;; xe-ddk|xe-sdk) select_pkgs_xe ;; diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index fc9c19c..b6b846d 100755 --- a/mk/xe-linux-distribution +++ b/mk/xe-linux-distribution @@ -128,6 +128,11 @@ identify_redhat() # distro=rocky # Rocky Linux release 8.3 + # 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) @@ -157,6 +162,8 @@ identify_redhat() -e 's/^CentOS Linux release \([0-9]*\)\.\([0-9]*\).*$/distro=centos;major=\1;minor=\2/gp;' \ -e 's/^CentOS Stream release \([0-9]*\).*$/distro=centos;major=\1/gp;' \ -e 's/^Rocky Linux release \([0-9]*\)\.\([0-9]*\).*$/distro=rocky;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;' \