- release++

[packages/postgresql.git] / postgresql.init

diff --git a/postgresql.init b/postgresql.init
index ef0bb663487d8f1c77b85df4016f9c116800e6a5..4b21ef182b7e12de0c2c4be31ab6486e4e67754c 100644 (file)
--- a/postgresql.init
+++ b/postgresql.init
@@ -22,12 +22,12 @@ if [ -f /etc/sysconfig/postgresql ] ; then
         . /etc/sysconfig/postgresql
 else
         ALLOW_TCP_CONNECTIONS=no
-       POSTGRES_DATA_DIR=/var/state/psql
+       POSTGRES_DATA_DIR=/var/lib/psql
 fi
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. Postgresql service can't be runed."
+if is_no "${NETWORKING}"; then
+       msg_Network_Down Postgresql
        exit 1
 fi
 
@@ -55,7 +55,7 @@ case "$1" in
                        mkdir -p $POSTGRES_DATA_DIR
                        chown postgres.postgres $POSTGRES_DATA_DIR
                    fi
-                   show Creating postgresql init database
+                   show "Creating postgresql init database"
                    busy
                    su postgres -c "LD_LIBRARY_PATH=/usr/lib \
                        initdb --pgdata=$POSTGRES_DATA_DIR \
@@ -71,7 +71,7 @@ case "$1" in
                        $([ -n "POSTGRES_$DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR") \
                        -o \
                        $([ "$POSTGRES_QUIET" = yes ] && echo "-Q") \
-                       $([ "$POSTGRES_DIABLE_FSYNC" = yes ] && echo "-F") &"
+                       $([ "$POSTGRES_DIABLE_FSYNC" = yes ] && echo "-F") 2> /dev/null &"
                sleep 2
                if ps ax | grep -v grep | grep -q postmaster; then
                        deltext; ok
@@ -79,12 +79,12 @@ case "$1" in
                        deltext; fail
                fi
        else
-               echo "Postgresql already is running"
+               msg_Already_Running Postgresql
        fi
        touch /var/lock/subsys/postgresql
        ;;
   stop)
-       show Stopping postgresql service
+       msg_stopping postgresql
        killproc postmaster
        sleep 2
        rm -f /var/run/postmaster.pid
@@ -98,7 +98,7 @@ case "$1" in
        $0 start
        ;;
   *)
-       echo "Usage: postgresql {start|stop|status|restart|reload}"
+       msg_Usage "$0 {start|stop|status|restart|reload}"
        exit 1
 esac