--- webmin-1.350/os_list.txt.oslist 2007-05-31 21:20:52.000000000 -0400 +++ webmin-1.350/os_list.txt 2007-06-11 08:33:33.000000000 -0400 @@ -89,6 +89,7 @@ Cobalt Linux 6.4 cobalt-linux 6.4 `una # Mandrake corporate Mandrake Linux Corporate Server 1.0 redhat-linux 6.2 $etc_issue =~ /Mandrake\s+Corporate\s+Server\s+release\s+1\.0/i +Mandriva Linux Corporate Server 4.0 mandrake-linux 2006 $etc_issue =~ /Mandriva\s+Linux\s+Corporate\s+Server\s+release\s+2006\.0/i # Mandrake derivatives pclinuxos Linux 2005 mandrake-linux 10.0 `cat /etc/mandrake-release 2>/dev/null` =~ /pclinuxos\s+Linux\s+release\s+2005/i @@ -104,6 +105,7 @@ Mandrake Linux 7.1 redhat-linux 6.2 $e Mandrake Linux $1 mandrake-linux $1 `cat /etc/mandrake-release 2>/dev/null` =~ /Mandrake.*?([0-9\.]+)/i || $etc_issue =~ /Mandrake\s+release\s+([0-9\.]+)/i || $etc_issue =~ /Mandrakelinux\s+release\s+([0-9\.]+)/i Mandriva Linux $2 mandrake-linux 10.2 $etc_issue =~ /(Mandrakelinux|Mandriva).*(2006\.\d+)/i || `cat /etc/mandrake-release 2>/dev/null` =~ /(Mandrakelinux|Mandriva).*(2007\.\d+)/i Mandriva Linux $2 mandrake-linux 10.3 $etc_issue =~ /(Mandrakelinux|Mandriva).*(2007\.\d+)/i || `cat /etc/mandrake-release 2>/dev/null` =~ /(Mandrakelinux|Mandriva).*(2007\.\d+)/i +Mandriva Linux $1 mandrake-linux $1 $etc_issue =~ /Mandriva\s+Linux\s+release\s+(200\d\.\d+)/i # Conectiva Linux (now subsumed into Mandrake?) Conectiva Linux 3.0 redhat-linux 5.2 $etc_issue =~ /Conectiva.*Linux.*3\.0/i