From 0ce816a6b22ee8091beb5300703a6ee8154a3440 Mon Sep 17 00:00:00 2001 From: Scott Noel-Hemming Date: Fri, 23 Aug 2019 12:06:06 -0700 Subject: [PATCH 1/2] Update xe-linux-distribution The CloudLinux OS, which is based on CentOS, isn't detected properly by the xentools. This adjustment allows it to be. --- mk/xe-linux-distribution | 1 + 1 file changed, 1 insertion(+) diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index dc35b2b..03aff05 100755 --- a/mk/xe-linux-distribution +++ b/mk/xe-linux-distribution @@ -148,6 +148,7 @@ 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 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;' \ From 402b73ca7cb9cd4e77fb0ad4d70f4efd0bafe0e2 Mon Sep 17 00:00:00 2001 From: Scott Noel-Hemming Date: Wed, 11 Sep 2019 17:07:12 -0700 Subject: [PATCH 2/2] Update xe-linux-distribution Made some changes to handle more diverse strings in the redhat-release file for cloudlinux, including documentation similar to CentOS. --- mk/xe-linux-distribution | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index 03aff05..097cc70 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,7 +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 release \([0-9]*\)\.\([0-9]*\)\(\.[0-9]*\)\? (.*)/distro=cloudlinux;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;' \