[csw-devel] SF.net SVN: gar:[12145] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5

[wahwah at users.sourceforge.net]

Revision: 12145
          http://gar.svn.sourceforge.net/gar/?rev=12145&view=rev
Author:   wahwah
Date:     2011-01-02 10:46:54 +0000 (Sun, 02 Jan 2011)

Log Message:
-----------
mysql-5.0.x: Fix a bug with restarts in the global zone

Using pgrep without the -z option results in processes from other zones being
printed; the restart command in the global zone would never finish unless
processes in non-global zones are stopped.

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5	2011-01-02 10:41:21 UTC (rev 12144)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5	2011-01-02 10:46:54 UTC (rev 12145)
@@ -173,7 +173,13 @@
 
     restart)
     stop_it
-    while pgrep mysqld > /dev/null
+    if [ -x /bin/zonename ]
+    then
+      pgrep_opts="-z `/bin/zonename`"
+    else
+      pgrep_opts=""
+    fi
+    while pgrep ${pgrep_opts} mysqld > /dev/null
       do
       sleep 1
     done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.