Amazon linux

diff --git a/CHANGELOG b/CHANGELOG
index f73022f..c401fae 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -142,3 +142,4 @@ Majoe French translation update, thanks to ButterflyOfFire.
 Allow per-language language overrides to be defined, in custom-lang.$code files.
 Updated numerous modules to improve support for Debian 6 and Ubuntu 10.10.
 If a browser asks for gzip compression and a file with a .gz extension exists in the same directory as a static file, Webmin will now serve the gzipped file instead.
+Added support for Amazon Linux.

diff --git a/os_list.txt b/os_list.txt
index 7f57e5f..91837b6 100644 (file)
--- a/os_list.txt
+++ b/os_list.txt
@@ -11,6 +11,7 @@ Pardus                               2009                     pardus-linux    $1      `cat /etc/pardus-release 2>
 Pardus                        2009.1 Anthropoides virgo                        pardus-linux    $1      `cat /etc/pardus-release 2>/dev/null` =~ /Pardus\s+2009.1\s+/i
 Pardus                        2009.2 Geronticus eremita        pardus-linux    $1      `cat /etc/pardus-release 2>/dev/null` =~ /Pardus\s+2009.2\s+/i
 Pardus                        2011                     pardus-linux    $1      `cat /etc/pardus-release 2>/dev/null` =~ /Pardus\s+2011\s+/i
+
 # Sun Solaris
 Sun Solaris                    2.5.1   solaris         2.5.1   $uname =~ /SunOS.*\s5\.5\.1\s/i
 Sun Solaris                    2.6     solaris         2.6     $uname =~ /SunOS.*\s5\.6\s/i
@@ -63,6 +64,9 @@ cAos Linux                    $1      redhat-linux    sprintf("%.1f", 10.0+$1)        `cat /etc/caos-release 2>/
 Wind River Linux               3.0     redhat-linux    18.0    `cat /etc/wrs-release 2>/dev/null` =~ /Wind\s+River\s+Linux\s+3\.0/
 Wind River Linux               2.0     redhat-linux    16.0    `cat /etc/wrs-release 2>/dev/null` =~ /Wind\s+River\s+Linux\s+2\.0/
 
+# Amazon Linux
+Amazon Linux                   $1      redhat-linux    20.0    `cat /etc/system-release 2>/dev/null` =~ /Amazon\s+Linux.*\s2011/
+
 # Free Redhat Linux and Fedora
 Redhat Linux                   $1      redhat-linux    $1      `cat /etc/redhat-release 2>/dev/null` =~ /red.*hat.*release\s+(\S+)/i && `cat /etc/redhat-release 2>/dev/null` !~ /[eE]nterprise|AS|ES|WS|[aA]dvanced/
 Redhat Linux                   "Fedora $1"     redhat-linux    sprintf("%.1f", 9.0+$1)         `cat /etc/redhat-release /etc/fedora-release 2>/dev/null` =~ /Fedora.*\s([0-9\.]+)\s/i || `cat /etc/redhat-release /etc/fedora-release 2>/dev/null` =~ /Fedora.*\sFC(\S+)\s/i