diff options
author | Bruce Momjian <bruce@momjian.us> | 2001-07-11 04:57:34 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2001-07-11 04:57:34 +0000 |
commit | 443db06d84efc9e48173294f5fabcc665c9269b1 (patch) | |
tree | 3a59718ed6ff1b09f342d396b31910d93f7262e3 | |
parent | 62f5badebf9db4c3aa838a649ac958e3c120559e (diff) | |
download | postgresql-443db06d84efc9e48173294f5fabcc665c9269b1.tar.gz postgresql-443db06d84efc9e48173294f5fabcc665c9269b1.zip |
Fix duplication of -D during pg_ctl restart, from Peter E's patch.
-rwxr-xr-x | src/bin/pg_ctl/pg_ctl.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh index abc06b8d3f3..a8953b0a6e9 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.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 & |