From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 28 Aug 2004 21:10:00 +0000 (+0000)
Subject: Prevent pg_ctl restart from adding -D datadir multiple times.
X-Git-Tag: REL7_4_6~23
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=4d608ac197f277c8ee43ffdf61d0354daed7930d;p=users%2Fc2main%2Fpostgres.git

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 4dcbc10d2f..c0bffd44ee 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