packages: mysql/mysql.init - respect skip-networking in status

[glen]

Author: glen                         Date: Wed Sep 16 13:16:31 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- respect skip-networking in status

---- Files affected:
packages/mysql:
   mysql.init (1.135 -> 1.136) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.init
diff -u packages/mysql/mysql.init:1.135 packages/mysql/mysql.init:1.136
--- packages/mysql/mysql.init:1.135     Tue Sep  8 14:41:47 2009
+++ packages/mysql/mysql.init   Wed Sep 16 15:16:26 2009
@@ -187,7 +187,7 @@
        fi
 
        # reset to initial state
-       MYSQL_DATA_DIR= MYSQL_USER= MYSQL_PIDFILE= MYSQL_SOCKET= MYSQL_PORT= 
MYSQL_BIND_ADDRESS=
+       MYSQL_DATA_DIR= MYSQL_USER= MYSQL_PIDFILE= MYSQL_SOCKET= MYSQL_PORT= 
MYSQL_BIND_ADDRESS= MYSQL_SKIP_NETWORKING=
 
        eval `awk -F= '
        # skip comments and empty lines
@@ -218,6 +218,8 @@
                        printf("MYSQL_PORT=%s;", $2);
                } else if ($1 == "bind-address") {
                        printf("MYSQL_BIND_ADDRESS=%s;", $2);
+               } else if ($1 == "skip-networking") {
+                       printf("MYSQL_SKIP_NETWORKING=1;");
                }
        }
        ' $config_file`
@@ -564,7 +566,9 @@
                        port=${MYSQL_PORT:-3306}
                        socket=${MYSQL_SOCKET:-/var/lib/mysql/mysql.sock}
                        pid=$MYSQL_PID
-                       show "MySQL cluster %s, pid %s\n\ttcp:%s:%s\n\tunix:%s" 
"$mysqldir" "$pid" "$addr" "$port" "$socket"
+                       nls "MySQL cluster %s, pid %s\n" "$mysqldir" "$pid"
+                       [ -z "$MYSQL_SKIP_NETWORKING" ] && nls "\ttcp:%s:%s\n" 
"$addr" "$port"
+                       nls "\tunix:%s\n" "$socket"
                        pids="$pids/$MYSQL_PID/"
                        progress "$MYSQL_STATUS"
                else
@@ -592,7 +596,9 @@
                                addr=${MYSQL_BIND_ADDRESS:-0.0.0.0}
                                port=${MYSQL_PORT:-3306}
                                
socket=${MYSQL_SOCKET:-/var/lib/mysql/mysql.sock}
-                               show "MySQL cluster %s, pid 
%s\n\ttcp:%s:%s\n\tunix:%s" "$mysqldir" "$pid" "$addr" "$port" "$socket"
+                               nls "MySQL cluster %s, pid %s\n" "$mysqldir" 
"$pid"
+                               [ -z "$MYSQL_SKIP_NETWORKING" ] && nls 
"\ttcp:%s:%s\n" "$addr" "$port"
+                               nls "\tunix:%s\n" "$socket"
                                progress "$MYSQL_STATUS"
                        else
                                show "MySQL cluster %s" "$mysqldir"
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.init?r1=1.135&r2=1.136&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit