[webmin-devel] patches for fixing "Asianux" detection

Ryoji Kamei <[email protected]> Tue, 03 Feb 2009 16:18:51 +0900

Newsgroups	gmane.comp.web.webmin.devel
Message-ID	<[email protected]>

Hello Webmin developers,

I made a couple of patches to fix "Asianux" or "Asianux Server" detection.
Can you examine and merge them for next release?

Regards,
-- 
Ryoji KAMEI <[email protected]> (http://www.miraclelinux.com/)
 Principal Engineer, Linux Distribution Group,
  Server Business Development Division, MIRACLE LINUX Corp.

------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com

-
Forwarded by the Webmin development list at [email protected]
To remove yourself from this list, go to
http://lists.sourceforge.net/lists/listinfo/webadmin-devel

usermin-1.380.spec.diff (text/x-patch, 1.1 KB)

--- usermin-1.380.spec.orig	2009-01-26 08:20:33.000000000 +0900
+++ usermin-1.380.spec	2009-02-03 15:55:18.000000000 +0900
@@ -129,6 +129,12 @@
 elsif (\$etc_issue =~ /OpenLinux.*3\\.2/i) {
 	print "oscheck='Caldera OpenLinux'\\n";
 	}
+elsif (\`cat /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+Server\\s+(\\d+)/i) {
+	print "oscheck='Asianux Server'\\n";
+	}
+elsif (\`cat /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+release\\s+(\\d+\\.\\d+)/i) {
+	print "oscheck='Asianux'\\n";
+	}
 elsif (\`cat /etc/whitebox-release 2>/dev/null\` =~ /White\\s+Box\\s+Enterprise\\s+Linux\\s+release\\s+(\\S+)/i) {
 	print "oscheck='Whitebox Linux'\\n";
 	}
@@ -189,9 +195,6 @@
 elsif (\`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /X\\/OS.*release\\s(\\S+)\\s/i) {
 	print "oscheck='X/OS Linux'\\n";
 	}
-elsif (\`cat /etc/release /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+release\\s+(\\S+)/i) {
-	print "oscheck='Asianux'\\n";
-	}
 elsif (\`cat /etc/Haansoft-release 2>/dev/null\` =~ /Haansoft\\s+Linux\\s+OS\\s+release\\s+(\\S+)/i) {
 	print "oscheck='Haansoft Linux'\\n";
 	}

usermin-1.380-asianux.patch (text/x-patch, 1.5 KB)

diff -duNr usermin-1.380.orig/os_list.txt usermin-1.380/os_list.txt
--- usermin-1.380.orig/os_list.txt	2009-01-26 08:19:58.000000000 +0900
+++ usermin-1.380/os_list.txt	2009-02-03 15:57:40.000000000 +0900
@@ -15,6 +15,8 @@
 Caldera OpenLinux		3.2	open-linux	3.2e	$etc_issue =~ /OpenLinux.*3\.2/i
 
 # Redhat enterprise clones
+Asianux Server			$1	redhat-linux	$1+10.0	`cat /etc/asianux-release 2>/dev/null` =~ /Asianux\s+Server\s+(\d+)/i
+Asianux				$1	redhat-linux	$1+10.0	`cat /etc/asianux-release 2>/dev/null` =~ /Asianux\s+release\s+(\d+\.\d+)/i
 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
@@ -41,7 +43,6 @@
 # Redhat clones
 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
-Asianux				$1	redhat-linux	10.0	`cat /etc/release /etc/asianux-release 2>/dev/null` =~ /Asianux\s+release\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
 cAos Linux			$1	redhat-linux	sprintf("%.1f", 10.0+$1)	`cat /etc/caos-release 2>/dev/null` =~ /release\s+(\S+)/i

webmin-1.450.spec.diff (text/x-patch, 1.1 KB)

--- webmin-1.450.spec.orig	2009-01-26 06:53:44.000000000 +0900
+++ webmin-1.450.spec	2009-02-03 15:40:00.000000000 +0900
@@ -136,6 +136,12 @@
 elsif (\$etc_issue =~ /OpenLinux.*3\\.2/i) {
 	print "oscheck='Caldera OpenLinux'\\n";
 	}
+elsif (\`cat /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+Server\\s+(\\d+)/i) {
+	print "oscheck='Asianux Server'\\n";
+	}
+elsif (\`cat /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+release\\s+(\\d+\\.\\d+)/i) {
+	print "oscheck='Asianux'\\n";
+	}
 elsif (\`cat /etc/whitebox-release 2>/dev/null\` =~ /White\\s+Box\\s+Enterprise\\s+Linux\\s+release\\s+(\\S+)/i) {
 	print "oscheck='Whitebox Linux'\\n";
 	}
@@ -196,9 +202,6 @@
 elsif (\`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /X\\/OS.*release\\s(\\S+)\\s/i) {
 	print "oscheck='X/OS Linux'\\n";
 	}
-elsif (\`cat /etc/release /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+release\\s+(\\S+)/i) {
-	print "oscheck='Asianux'\\n";
-	}
 elsif (\`cat /etc/Haansoft-release 2>/dev/null\` =~ /Haansoft\\s+Linux\\s+OS\\s+release\\s+(\\S+)/i) {
 	print "oscheck='Haansoft Linux'\\n";
 	}

webmin-1.450-asianux.patch (text/x-patch, 2.1 KB)

diff -duNr webmin-1.450.orig/os_list.txt webmin-1.450/os_list.txt
--- webmin-1.450.orig/os_list.txt	2009-01-26 06:48:58.000000000 +0900
+++ webmin-1.450/os_list.txt	2009-02-03 12:57:19.000000000 +0900
@@ -15,6 +15,8 @@
 Caldera OpenLinux		3.2	open-linux	3.2e	$etc_issue =~ /OpenLinux.*3\.2/i
 
 # Redhat enterprise clones
+Asianux Server			$1	redhat-linux	$1+10.0	`cat /etc/asianux-release 2>/dev/null` =~ /Asianux\s+Server\s+(\d+)/i
+Asianux				$1	redhat-linux	$1+10.0	`cat /etc/asianux-release 2>/dev/null` =~ /Asianux\s+release\s+(\d+\.\d+)/i
 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
@@ -41,7 +43,6 @@
 # Redhat clones
 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
-Asianux				$1	redhat-linux	10.0	`cat /etc/release /etc/asianux-release 2>/dev/null` =~ /Asianux\s+release\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
 cAos Linux			$1	redhat-linux	sprintf("%.1f", 10.0+$1)	`cat /etc/caos-release 2>/dev/null` =~ /release\s+(\S+)/i
 
diff -duNr webmin-1.450.orig/servers/servers-lib.pl webmin-1.450/servers/servers-lib.pl
--- webmin-1.450.orig/servers/servers-lib.pl	2009-01-26 06:49:17.000000000 +0900
+++ webmin-1.450/servers/servers-lib.pl	2009-02-03 12:57:19.000000000 +0900
@@ -263,6 +263,7 @@
 @server_types = (
 		  # Linux sub-types, which have to come first
 		  [ 'asianux', 'Asianux', undef, 'Asianux' ],
+		  [ 'asianux', 'Asianux Server', undef, 'Asianux' ],
 		  [ 'centos', 'CentOS Linux', undef, 'CentOS' ],
 		  [ 'ubuntu', 'Ubuntu Linux', undef, 'Ubuntu' ],
 		  [ 'fedora', 'Fedora Linux', undef, 'Fedora' ],