Fix duplication of -D during pg_ctl restart, from Peter E's patch.

bmomjian · bmomjian · commit 443db06d84ef · 2001-07-11T04:57:34.000Z
diff --git 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.20 2001/04/21 11:23:58 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.21 2001/07/11 04:57:34 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -316,7 +316,8 @@ if [ $op = "start" -o $op = "restart" ];then
         eval set X "$POSTOPTS"; shift
     fi
 
-    set X -D "$PGDATA" ${1+"$@"}; shift
+    # pass environment into new postmaster
+    export PGDATA
 
     if [ -n "$logfile" ]; then
         "$po_path" "$@" </dev/null >>$logfile 2>&1 &

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`#`
`10`	`10`	`# IDENTIFICATION`
`11`		`-# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.20 2001/04/21 11:23:58 petere Exp $`
	`11`	`+# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.21 2001/07/11 04:57:34 momjian Exp $`
`12`	`12`	`#`
`13`	`13`	`#-------------------------------------------------------------------------`
`14`	`14`
`@@ -316,7 +316,8 @@ if [ $op = "start" -o $op = "restart" ];then`
`316`	`316`	`eval set X "$POSTOPTS"; shift`
`317`	`317`	`fi`
`318`	`318`
`319`		`- set X -D "$PGDATA" ${1+"$@"}; shift`
	`319`	`+ # pass environment into new postmaster`
	`320`	`+ export PGDATA`
`320`	`321`
`321`	`322`	`if [ -n "$logfile" ]; then`
`322`	`323`	`"$po_path" "$@" </dev/null >>$logfile 2>&1 &`