postgres.git / summary / log / commit / refs

commit    4d608ac197f277c8ee43ffdf61d0354daed7930d
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Sat Aug 28 21:10:00 2004 +0000
First released in: 7.4.6

    Prevent pg_ctl restart from adding -D datadir multiple times.


 src/bin/pg_ctl/pg_ctl.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index 4dcbc10d2f7..c0bffd44ee0 100755
--- 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


[parent: 288e0404b831]