(unnamed)

text/plain

Download

Index: src/bin/pg_ctl/pg_ctl.sh
===================================================================
RCS file: /cvsroot/pgsql-server/src/bin/pg_ctl/pg_ctl.sh,v
retrieving revision 1.30
diff -c -c -r1.30 pg_ctl.sh
*** src/bin/pg_ctl/pg_ctl.sh	18 Oct 2002 22:05:35 -0000	1.30
--- src/bin/pg_ctl/pg_ctl.sh	14 Feb 2003 22:04:56 -0000
***************
*** 115,120 ****
--- 115,122 ----
  logfile=
  silence_echo=
  shutdown_mode=smart
+ PGDATAOPTS=""
+ POSTOPTS=""
  
  while [ "$#" -gt 0 ]
  do
***************
*** 129,135 ****
  	    ;;
  	-D)
  	    shift
! 	    # pass environment into new postmaster
  	    PGDATA="$1"
  	    export PGDATA
  	    ;;
--- 131,138 ----
  	    ;;
  	-D)
  	    shift
! 	    # we need to do this so -D datadir shows in ps display
! 	    PGDATAOPTS="-D $1"
  	    PGDATA="$1"
  	    export PGDATA
  	    ;;
***************
*** 333,344 ****
      fi
  
      if [ -n "$logfile" ]; then
!         "$po_path" ${1+"$@"} </dev/null >>$logfile 2>&1 &
      else
          # when starting without log file, redirect stderr to stdout, so
          # pg_ctl can be invoked with >$logfile and still have pg_ctl's
          # stderr on the terminal.
!         "$po_path" ${1+"$@"} </dev/null 2>&1 &
      fi
  
      # if had an old lockfile, check to see if we were able to start
--- 336,347 ----
      fi
  
      if [ -n "$logfile" ]; then
!         "$po_path" ${1+"$@"} ${PGDATAOPTS+$PGDATAOPTS} </dev/null >>$logfile 2>&1 &
      else
          # when starting without log file, redirect stderr to stdout, so
          # pg_ctl can be invoked with >$logfile and still have pg_ctl's
          # stderr on the terminal.
!         "$po_path" ${1+"$@"} ${PGDATAOPTS+$PGDATAOPTS} </dev/null 2>&1 &
      fi
  
      # if had an old lockfile, check to see if we were able to start