projects / webmin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Handle hostnames with upper-case letters
[webmin.git] / os_list.txt
diff --git a/os_list.txt b/os_list.txt
index 77b2bce..3046a90 100644 (file)
--- a/os_list.txt
+++ b/os_list.txt
@@ -34,10 +34,9 @@ Asianux                              $1      redhat-linux    $1+10.0 `cat /etc/asianux-release 2>/dev/null` =~ /As
 Whitebox Linux                 $1      redhat-linux    10.0    `cat /etc/whitebox-release 2>/dev/null` =~ /White\s+Box\s+Enterprise\s+Linux\s+release\s+(\S+)/i
 Tao Linux                      $1      redhat-linux    10.0    `cat /etc/redhat-release 2>/dev/null` =~ /Tao\s+Linux\s+release\s+(\S+)/i
 CentOS Linux                   $1      redhat-linux    10.0    `cat /etc/centos-release /etc/redhat-release 2>/dev/null` =~ /CentOS\s+release\s+(\S+)/i && $1 < 4
-CentOS Linux                   $1      redhat-linux    $1+8.0  `cat /etc/centos-release /etc/redhat-release 2>/dev/null` =~ /CentOS\s+release\s+(\S+)/i && $1 >= 4
+CentOS Linux                   $2      redhat-linux    $2+8.0  `cat /etc/centos-release /etc/redhat-release 2>/dev/null` =~ /CentOS\s+(Linux\s+)?release\s+(\S+)/i && $2 >= 4
 Scientific Linux               $1      redhat-linux    10.0    `cat /etc/redhat-release 2>/dev/null` =~ /Scientific\s+Linux.*\s+release\s+(\S+)/i && $1 < 4
-Scientific Linux               $1      redhat-linux    13.0    `cat /etc/redhat-release 2>/dev/null` =~ /Scientific\s+Linux.*\s+release\s+(\S+)/i && $1 >= 4 && $1 < 6
-Scientific Linux               $1      redhat-linux    14.0    `cat /etc/redhat-release 2>/dev/null` =~ /Scientific\s+Linux.*\s+release\s+(\S+)/i && $1 >= 6
+Scientific Linux               $1      redhat-linux    $1+8.0  `cat /etc/redhat-release 2>/dev/null` =~ /Scientific\s+Linux.*\s+release\s+(\d+)/i && $1 >= 4
 Gralinux                       $1      redhat-linux    $2+8.0  `cat /etc/redhtat-release 2>/dev/null` =~ /Gralinux\s+(ES|AS|WS)\s+release\s+(\d+)/i
 NeoShine Linux                 $1      redhat-linux    $1+10   `cat /etc/neoshine-release 2>/dev/null` =~ /NeoShine\s+Linux.*release\s+(\d+)/i
 Endian Firewall Linux          $1      redhat-linux    $1+10.0 `cat /etc/endian-release 2>/dev/null` =~ /release\s+(\S+)/
@@ -51,7 +50,7 @@ Redhat Enterprise Linux                       2.1ES   redhat-linux    7.3     `cat /etc/redhat-release 2>/dev
 Redhat Enterprise Linux                        2.1WS   redhat-linux    7.3     `cat /etc/redhat-release 2>/dev/null` =~ /WS.*2\.1/
 Redhat Enterprise Linux                        3.0AS   redhat-linux    10.0    `cat /etc/redhat-release 2>/dev/null` =~ /(3\.0AS)|(2\.9\.5AS)|(AS\s+release\s+3)/i
 Redhat Enterprise Linux                        "$2$1"  redhat-linux    $2 >= 4 ? $2+8.0 : 10.0 `cat /etc/redhat-release 2>/dev/null` =~ /(ES|AS|WS)\s+release\s+(\S+)/
-Redhat Enterprise Linux                        $2      redhat-linux    $2+8.0  `cat /etc/redhat-release 2>/dev/null` =~ /Red.*Hat\s+Enterprise\s+Linux\s+(Server|Client)\s+release\s+(\d+)/i
+Redhat Enterprise Linux                        $2      redhat-linux    $2+8.0  `cat /etc/redhat-release 2>/dev/null` =~ /Red.*Hat\s+Enterprise\s+Linux\s+(Server|Client|Workstation)\s+release\s+(\d+)/i
 
 # Redhat enterprise desktop
 Redhat Linux Desktop                   $1      redhat-linux    10.0    `cat /etc/redhat-release 2>/dev/null` =~ /Desktop\s+release\s+(\S+)/i || `cat /etc/redhat-release 2>/dev/null` =~ /ES\s+release\s+(\S+)/i
@@ -95,6 +94,14 @@ Ubuntu Linux                 $1      debian-linux    3.1     $etc_issue =~ /Ubuntu.*\s([0-9\.]+)\s/i
 Mepis Linux                    $1      debian-linux    $1      $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/
 Mepis Linux                    $1      debian-linux    4.0     $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /(stable)/
 
+# Linux Mint (Mint should be before Debian to avoid false-positive)
+Linux Mint             6       debian-linux    5.0     `cat /etc/lsb-release | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 6 Felicia"/
+Linux Mint                     7       debian-linux    5.0     `cat /etc/lsb-release | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 7 Gloria"/
+Linux Mint                     8       debian-linux    6.0     `cat /etc/lsb-release | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 8 Helena"/
+Linux Mint                     9       debian-linux    6.0     `cat /etc/lsb-release | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 9 Isadora"/
+Linux Mint                     10      debian-linux    6.0     `cat /etc/lsb-release | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 10 Julia"/
+Linux Mint                     11      debian-linux    6.0     `cat /etc/lsb-release | grep DISTRIB_DESCRIPTION` =~ /^DISTRIB_DESCRIPTION="Linux Mint 11 Katya"/
+
 # Debian Linux versions with numbers
 Debian Linux                   $1      debian-linux    $1      $etc_issue =~ /Debian.*\s([0-9\.]+)\s/i || `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/
 Debian Linux                   2.0     debian-linux    2.0     `cat /etc/debian_version 2>/dev/null` =~ /^(hamm)/i
@@ -105,6 +112,7 @@ Debian Linux                        3.1     debian-linux    3.1     `cat /etc/debian_version 2>/dev/null` =~ /^(
 Debian Linux                   4.0     debian-linux    4.0     `cat /etc/debian_version 2>/dev/null` =~ /^(etch)/i
 Debian Linux                   5.0     debian-linux    5.0     `cat /etc/debian_version 2>/dev/null` =~ /^(lenny)/i
 Debian Linux                   6.0     debian-linux    6.0     `cat /etc/debian_version 2>/dev/null` =~ /^(squeeze)/i
+Debian Linux                   7.0     debian-linux    7.0     `cat /etc/debian_version 2>/dev/null` =~ /^(wheezy)/i
 # These change sometimes...
 Debian Linux                   5.0     debian-linux    5.0     `cat /etc/debian_version 2>/dev/null` =~ /^(stable)/i
 # These don't have a version number yet, so we use the one from "stable"
Webmin PERL server management