--- resources/OCF/pgsql.in.andrew	2007-02-26 13:21:39.000000000 -0500
+++ resources/OCF/pgsql.in	2007-02-26 13:24:26.000000000 -0500
@@ -19,8 +19,7 @@
 #  OCF_RESKEY_pgport - Port where PostgreSQL is listening
 #  OCF_RESKEY_pgdb   - database to monitor. Default is template1
 #  OCF_RESKEY_logfile - Path to PostgreSQL log file. Default is /dev/null
-#  OCF_RESKEY_start_wait - Start waiting time. Default is 30
-#  OCF_RESKEY_stop_wait - Stop waiting time. Default is 30
+#  OCF_RESKEY_stop_escalate - Stop waiting time. Default is 30
 ###############################################################################
 # Initialization:
 
@@ -210,9 +209,11 @@
     fi
 
     rc=$OCF_ERR_GENERIC
-    while [ $rc != 0 ]; do
+    while [ $rc -ne 0 ]; do
         pgsql_monitor
         rc=$? 
+        sleep 1
+        ocf_log info "PostgreSQL hasn't started yet. Retrying ..."
     done
 
     return $OCF_SUCCESS
@@ -231,7 +232,7 @@
 
     # stop waiting
     count=0
-    while [ $count -lt $STOP_WAIT ]
+    while [ $count -lt $OCF_RESKEY_stop_escalate ]
     do
         if ! pgsql_status
         then
@@ -367,19 +368,19 @@
     exit 1
 fi
 
-: ${OCF_RESKEY_pgctl:-/usr/bin/pg_ctl}
-: ${OCF_RESKEY_start_opt:-""}
-: ${OCF_RESKEY_ctl_opt:-""}
-: ${OCF_RESKEY_psql:-/usr/bin/psql}
-: ${OCF_RESKEY_pgdata:-/var/lib/pgsql/data}
-: ${OCF_RESKEY_pgdba:-postgres}
-: ${OCF_RESKEY_pghost:-""}
-: ${OCF_RESKEY_pgport:-"5432"}
-: ${OCF_RESKEY_pgdb:-template1}
-: ${OCF_RESKEY_logfile:-/dev/null}
-: ${OCF_RESKEY_stop_escalate:-"30"}
+: ${OCF_RESKEY_pgctl:=/usr/bin/pg_ctl}
+: ${OCF_RESKEY_start_opt:=""}
+: ${OCF_RESKEY_ctl_opt:=""}
+: ${OCF_RESKEY_psql:=/usr/bin/psql}
+: ${OCF_RESKEY_pgdata:=/var/lib/pgsql/data}
+: ${OCF_RESKEY_pgdba:=postgres}
+: ${OCF_RESKEY_pghost:=""}
+: ${OCF_RESKEY_pgport:="5432"}
+: ${OCF_RESKEY_pgdb:=template1}
+: ${OCF_RESKEY_logfile:=/dev/null}
+: ${OCF_RESKEY_stop_escalate:="30"}
 
-PIDFILE=${PGDATA}/postmaster.pid
+PIDFILE=${OCF_RESKEY_pgdata}/postmaster.pid
 
 case "$1" in
     methods)    pgsql_methods