|
8 | 8 | # |
9 | 9 | # |
10 | 10 | # IDENTIFICATION |
11 | | -# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.30 2002/10/18 22:05:35 petere Exp $ |
| 11 | +# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.31 2003/02/14 22:18:25 momjian Exp $ |
12 | 12 | # |
13 | 13 | #------------------------------------------------------------------------- |
14 | 14 |
|
@@ -115,6 +115,8 @@ wait_seconds=60 |
115 | 115 | logfile= |
116 | 116 | silence_echo= |
117 | 117 | shutdown_mode=smart |
| 118 | +PGDATAOPTS="" |
| 119 | +POSTOPTS="" |
118 | 120 |
|
119 | 121 | while ["$#"-gt 0 ] |
120 | 122 | do |
|
129 | 131 | ;; |
130 | 132 | -D) |
131 | 133 | shift |
132 | | -# pass environment into new postmaster |
| 134 | +# we need to do this so -D datadir shows in ps display |
| 135 | + PGDATAOPTS="-D$1" |
133 | 136 | PGDATA="$1" |
134 | 137 | export PGDATA |
135 | 138 | ;; |
@@ -333,12 +336,12 @@ if [ "$op" = "start" -o "$op" = "restart" ];then |
333 | 336 | fi |
334 | 337 |
|
335 | 338 | if [-n"$logfile" ];then |
336 | | -"$po_path"${1+"$@"}</dev/null>>$logfile2>&1& |
| 339 | +"$po_path"${1+"$@"}${PGDATAOPTS+$PGDATAOPTS}</dev/null>>$logfile2>&1& |
337 | 340 | else |
338 | 341 | # when starting without log file, redirect stderr to stdout, so |
339 | 342 | # pg_ctl can be invoked with >$logfile and still have pg_ctl's |
340 | 343 | # stderr on the terminal. |
341 | | -"$po_path"${1+"$@"}</dev/null2>&1& |
| 344 | +"$po_path"${1+"$@"}${PGDATAOPTS+$PGDATAOPTS}</dev/null2>&1& |
342 | 345 | fi |
343 | 346 |
|
344 | 347 | # if had an old lockfile, check to see if we were able to start |
|