Déplacé script de configuration MySQL du stage5 vers stage3. Le script de configurati...

diff --git a/stage3/INSTALL b/stage3/INSTALL
index d651941..cc0d8db 100644 (file)
--- a/stage3/INSTALL
+++ b/stage3/INSTALL
@@ -5,3 +5,9 @@ Installation
 
 1. Type:
    $> sudo make
+
+2. Reboot.
+
+After rebooting, and if you have installed MYSQL, configure MySQL
+with this script:
+  /usr/local/bin/hv-config-mysql

diff --git a/stage3/misc/hv-config-mysql b/stage3/misc/hv-config-mysql
new file mode 100755 (executable)
index 0000000..ec2e774
--- /dev/null
+++ b/stage3/misc/hv-config-mysql
@@ -0,0 +1,44 @@
+#!/bin/bash
+set -o errexit
+
+# Script de configuration pour MySQL
+
+READ_VALID="no"
+
+while [ "${READ_VALID}" = "no" ]; do
+    echo "Do you want to set MySQL root password? (y/n): "
+    read SET_MYSQL_ROOT_PASS
+    
+    if [ "${SET_MYSQL_ROOT_PASS}" = "y" -o "${SET_MYSQL_ROOT_PASS}" = "n" ]; then
+       READ_VALID="yes"
+    else
+       echo "Error, answer y or n"
+    fi
+done
+
+if [ "${SET_MYSQL_ROOT_PASS}" = "y" ]; then
+    # Make sure MySQL is started
+    /etc/rc.d/init.d/mysql start
+    
+    PASS_MATCH="no"
+    
+    while [ "${PASS_MATCH}" = "no" ]; do
+       echo -n "Enter new MySQL root password: " >&2
+       read PASS1
+       echo -n "Re-enter password to confirm : " >&2
+       read PASS2
+       
+       if [ "${PASS1}" != "${PASS2}" ]; then
+           echo "Error, passwords don't match"
+       else
+           PASS_MATCH="yes"
+       fi
+    done
+    
+    mysqladmin -u root password ${PASS1}
+    echo "MySQL root password set."
+    
+    echo "Shutting down MySQL server:"
+fi
+
+exit $?

diff --git a/stage3/pkg/mysql b/stage3/pkg/mysql
index aef7651..47163bb 100644 (file)
--- a/stage3/pkg/mysql
+++ b/stage3/pkg/mysql
@@ -52,4 +52,7 @@ hvbuild_post()
 
     # Addition to /etc/ld.so.conf
     string_add "/usr/lib/mysql" /etc/ld.so.conf
+
+    # Install Hv configuration script
+    install -m644 ${SCRDIR}/misc/hv-config-mysql /usr/local/bin
 }

diff --git a/stage5/post-install b/stage5/post-install
index f9dbdb3..e5adb97 100755 (executable)
--- a/stage5/post-install
+++ b/stage5/post-install
@@ -3,49 +3,6 @@
 source ../functions/main
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    
-    #########################################
-    # MySQL
-    #########################################
-    READ_VALID="no"
-    
-    while [ "${READ_VALID}" = "no" ]; do
-       echo "Do you want to set MySQL root password? (y/n): "
-       read SET_MYSQL_ROOT_PASS
-       
-       if [ "${SET_MYSQL_ROOT_PASS}" = "y" -o "${SET_MYSQL_ROOT_PASS}" = "n" ]; then
-           READ_VALID="yes"
-       else
-           echo "Error, answer y or n"
-       fi
-    done
-    
-    if [ "${SET_MYSQL_ROOT_PASS}" = "y" ]; then
-       # Further configuration requires that the MySQL server be running: 
-       mysqld_safe --user=mysql 2>&1 >/dev/null &
-       
-       PASS_MATCH="no"
-       
-       while [ "${PASS_MATCH}" = "no" ]; do
-           echo -n "Enter new MySQL root password: " >&2
-           read PASS1
-           echo -n "Re-enter password to confirm : " >&2
-           read PASS2
-           
-           if [ "${PASS1}" != "${PASS2}" ]; then
-               echo "Error, passwords don't match"
-           else
-               PASS_MATCH="yes"
-           fi
-       done
-       
-       mysqladmin -u root password ${PASS1}
-       echo "MySQL root password set."
-       
-       echo "Shutting down MySQL server:"
-       # Configuration of the server is now finished. Shuting down the server.
-       mysqladmin -p shutdown
-    fi
 
     #########################################
     # Apache