diff --git a/os_list.txt b/os_list.txt index c2559d3a9..eaec6d858 100644 --- a/os_list.txt +++ b/os_list.txt @@ -74,6 +74,8 @@ Redhat Linux Desktop $1 redhat-linux 10.0 `cat /etc/redhat-release 2>/dev/null AlmaLinux $1 redhat-linux $1+8.0 `cat /etc/almalinux-release 2>/dev/null` =~ /AlmaLinux.*?([\d\.]+)/i || `cat /etc/redhat-release 2>/dev/null` =~ /AlmaLinux.*?([\d\.]+)/i CloudLinux $1 redhat-linux $1+8.0 `cat /etc/cloudlinux-release 2>/dev/null` =~ /CloudLinux.*?([\d\.]+)/i || `cat /etc/redhat-release 2>/dev/null` =~ /CloudLinux.*?([\d\.]+)/i Rocky Linux $1 redhat-linux $1+8.0 `cat /etc/rocky-release 2>/dev/null` =~ /Rocky.*?([\d\.]+)/i || `cat /etc/redhat-release 2>/dev/null` =~ /Rocky.*?([\d\.]+)/i +openEuler LTS $1 redhat-linux sprintf("%d", $1+16.0) `cat /etc/os-release 2>/dev/null` =~ /openEuler.*?([\d\.]+).*?LTS/i +openEuler Innovation $1 redhat-linux sprintf("%d", $1+16.0) `cat /etc/os-release 2>/dev/null` =~ /openEuler\s+(?:\d+(?:\.\d+)?)["']?$/i AlphaCore Linux $1 redhat-linux 11.0 `cat /etc/alphacore-release 2>/dev/null` =~ /Alpha\s*Core\s+release\s+(\S+)\s/i X/OS Linux $1 redhat-linux sprintf("%.1f", 9.0+$1) `cat /etc/redhat-release /etc/fedora-release 2>/dev/null` =~ /X\/OS.*release\s(\S+)\s/i Haansoft Linux $1 redhat-linux 10.0 `cat /etc/Haansoft-release 2>/dev/null` =~ /Haansoft\s+Linux\s+OS\s+release\s+(\S+)/i diff --git a/setup-repos-nightly.sh b/setup-repos-nightly.sh index c88232056..40e3ea0ba 100644 --- a/setup-repos-nightly.sh +++ b/setup-repos-nightly.sh @@ -62,7 +62,7 @@ fi # Derivatives precise test osid_debian_like=$(echo "$osid" | grep "debian\|ubuntu") -osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos") +osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos\|openEuler") repoid_debian_like=debian if [ -n "${ID}" ]; then diff --git a/setup-repos.sh b/setup-repos.sh index 52956493f..da8a15ab1 100644 --- a/setup-repos.sh +++ b/setup-repos.sh @@ -61,7 +61,7 @@ fi # Derivatives precise test osid_debian_like=$(echo "$osid" | grep "debian\|ubuntu") -osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos") +osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos\|openEuler") repoid_debian_like=debian if [ -n "${ID}" ]; then diff --git a/webmin-setup-repos-nightly.sh b/webmin-setup-repos-nightly.sh index c88232056..40e3ea0ba 100644 --- a/webmin-setup-repos-nightly.sh +++ b/webmin-setup-repos-nightly.sh @@ -62,7 +62,7 @@ fi # Derivatives precise test osid_debian_like=$(echo "$osid" | grep "debian\|ubuntu") -osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos") +osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos\|openEuler") repoid_debian_like=debian if [ -n "${ID}" ]; then diff --git a/webmin-setup-repos.sh b/webmin-setup-repos.sh index 52956493f..da8a15ab1 100644 --- a/webmin-setup-repos.sh +++ b/webmin-setup-repos.sh @@ -61,7 +61,7 @@ fi # Derivatives precise test osid_debian_like=$(echo "$osid" | grep "debian\|ubuntu") -osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos") +osid_rhel_like=$(echo "$osid" | grep "rhel\|fedora\|centos\|openEuler") repoid_debian_like=debian if [ -n "${ID}" ]; then