Prevent pg_ctl restart from adding -D datadir multiple times.

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index 4dcbc10d2f7a684bd40d80e76d290a0d6eb5dbea..c0bffd44ee00493c521e6e99b8605229705833e0 100755 (executable)
--- a/src/bin/pg_ctl/pg_ctl.sh
+++ b/src/bin/pg_ctl/pg_ctl.sh
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.36 2003/08/14 18:56:41 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.36.4.1 2004/08/28 21:10:00 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -238,6 +238,11 @@ if [ "$op" = "reload" ];then
        wait=no
 fi
 
+# Prevent duplicate of -D flags on each restart
+if [ "$op" = "restart" ];then
+       PGDATAOPTS=""
+fi
+
 DEFPOSTOPTS=$PGDATA/postmaster.opts.default
 POSTOPTSFILE=$PGDATA/postmaster.opts
 PIDFILE=$PGDATA/postmaster.pid