xorg fonctionnel en mode vesa

[hvlinux.git] / stage3 / cis-postinstall

diff --git a/stage3/cis-postinstall b/stage3/cis-postinstall
index 70efd79..e76a0a7 100755 (executable)
--- a/stage3/cis-postinstall
+++ b/stage3/cis-postinstall
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name.
 
 # Reading system configuration informations, functions and package versions.
@@ -27,7 +29,6 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     if [ "${SET_MYSQL_ROOT_PASS}" = "y" ]; then
        # Further configuration requires that the MySQL server be running: 
        mysqld_safe --user=mysql 2>&1 >/dev/null &
-       evaluate_retval
        
        PASS_MATCH="no"
        
@@ -44,12 +45,12 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
            fi
        done
        
-       mysqladmin -u root password ${PASS1} || exit 1
+       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 || exit 1
+       mysqladmin -p shutdown
     fi
 
     #########################################
@@ -70,7 +71,7 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     done
     
     if [ "${USE_SSL}" = "y" ]; then
-       /etc/apache/generate-ssl-certs || exit 1
+       /etc/apache/generate-ssl-certs
     fi
     
     #########################################
@@ -91,10 +92,9 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     done
     
     if [ "${USE_SSL}" = "y" ]; then
-       /etc/mail/imap-ssl-certs || exit 1
+       /etc/mail/imap-ssl-certs
     fi
     
 fi
 
-# Return last error
 exit $?