[packages/mysql] init: setup socket symlink on success, not earlier

[glen]

commit 80fc3cc1314aa20c6ad8fbf73e9ce6b39ec37fa6
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Thu Sep 24 16:10:51 2015 +0300

    init: setup socket symlink on success, not earlier

 mysql.init | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/mysql.init b/mysql.init
index cf04ef2..34923ec 100755
--- a/mysql.init
+++ b/mysql.init
@@ -484,11 +484,6 @@ mysqlinit() {
            chmod 640 "$MYSQL_CLUSTER_DIR/mysqld.conf"
        fi
 
-       if [ ! -e /var/lib/mysql/mysql.sock ] || [ -L /var/lib/mysql/mysql.sock 
] && [ -z "$(readlink /var/lib/mysql/mysql.sock)" ]; then
-               sock=${MYSQL_SOCKET#/var/lib/mysql/} # make it relative if 
possible
-           ln -s "$sock" /var/lib/mysql/mysql.sock
-       fi
-
        cat > $MYSQL_DATA_DIR/mysql-init.sql <<-EOF
                CREATE DATABASE mysql;
                use mysql;
@@ -588,6 +583,12 @@ your OS.  Another information source is the MySQL email 
archive.
 END_OF_MSG
                exit 1
        fi
+
+       # if it's first server, register as default
+       if [ ! -e /var/lib/mysql/mysql.sock ] || [ -L /var/lib/mysql/mysql.sock 
] && [ -z "$(readlink /var/lib/mysql/mysql.sock)" ]; then
+               sock=${MYSQL_SOCKET#/var/lib/mysql/} # make it relative if 
possible
+           ln -s "$sock" /var/lib/mysql/mysql.sock
+       fi
 }
 
 #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mysql.git/commitdiff/722bcca24522170077a0a34227412bd55dfa77d8

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