From 031e1afa23846c6e26747a8ee99bdece80cb1da3 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 19 Apr 2001 19:17:44 +0000
Subject: [PATCH] Pass -D option to pg_ctl because export PGDATA won't be
 preserved across 'su -l'.

Reported by <VASQUEZ_JASON@LILLY.COM>.
---
 contrib/start-scripts/freebsd | 12 +++++-------
 contrib/start-scripts/linux   | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd
index fa80d8a103..a4e412cd69 100644
--- a/contrib/start-scripts/freebsd
+++ b/contrib/start-scripts/freebsd
@@ -6,7 +6,7 @@
 # Created through merger of the Linux start script by Ryan Kirkpatrick
 # and the script in the FreeBSD ports collection.
 
-# $Header: /cvsroot/pgsql/contrib/start-scripts/freebsd,v 1.1 2001/02/10 00:13:23 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/start-scripts/freebsd,v 1.2 2001/04/19 19:17:44 petere Exp $
 
 ## EDIT FROM HERE
 
@@ -24,8 +24,6 @@ PGLOG="$PGDATA/serverlog"
 
 ## STOP EDITING HERE
 
-export PGDATA
-
 # The path that is to be used for the script
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
@@ -36,17 +34,17 @@ test -x "$DAEMON" || exit 0
 
 case $1 in
     start)
-        su -l $PGUSER -c "$DAEMON start -s -l $PGLOG"
+        su -l $PGUSER -c "$DAEMON start -D '$PGDATA' -s -l $PGLOG"
 	echo -n ' postgresql'
 	;;
     stop)
-	su -l $PGUSER -c "$DAEMON stop -s -m fast"
+	su -l $PGUSER -c "$DAEMON stop -D '$PGDATA' -s -m fast"
 	;;
     restart)
-	su -l $PGUSER -c "$DAEMON restart -s -m fast"
+	su -l $PGUSER -c "$DAEMON restart -D '$PGDATA' -s -m fast"
 	;;
     status)
-	su -l $PGUSER -c "$DAEMON status"
+	su -l $PGUSER -c "$DAEMON status -D '$PGDATA'"
 	;;
     *)
 	# Print help
diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux
index 9b0d0737f3..9fd0786434 100644
--- a/contrib/start-scripts/linux
+++ b/contrib/start-scripts/linux
@@ -20,7 +20,7 @@
 
 # Original author:  Ryan Kirkpatrick <pgsql@rkirkpat.net>
 
-# $Header: /cvsroot/pgsql/contrib/start-scripts/linux,v 1.1 2001/02/08 19:53:33 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/start-scripts/linux,v 1.2 2001/04/19 19:17:44 petere Exp $
 
 ## EDIT FROM HERE
 
@@ -38,8 +38,6 @@ PGLOG="$PGDATA/serverlog"
 
 ## STOP EDITING HERE
 
-export PGDATA
-
 # Check for echo -n vs echo \c
 if echo '\c' | grep -s c >/dev/null 2>&1 ; then
     ECHO_N="echo -n"
@@ -64,21 +62,21 @@ test -f $DAEMON || exit 0
 case $1 in
   start)
 	$ECHO_N "Starting PostgreSQL: "$ECHO_C
-	su - $PGUSER -c "$DAEMON start -s -l $PGLOG" 
+	su - $PGUSER -c "$DAEMON start -D '$PGDATA' -s -l $PGLOG" 
 	echo "ok"
 	;;
   stop)
 	echo -n "Stopping PostgreSQL: "
-	su - $PGUSER -c "$DAEMON stop -s -m fast"
+	su - $PGUSER -c "$DAEMON stop -D '$PGDATA' -s -m fast"
 	echo "ok"
 	;;
   restart)
 	echo -n "Restarting PostgreSQL: "
-	su - $PGUSER -c "$DAEMON restart -s -m fast"
+	su - $PGUSER -c "$DAEMON restart -D '$PGDATA' -s -m fast"
 	echo "ok"
 	;;
   status)
-	su - $PGUSER -c "$DAEMON status"
+	su - $PGUSER -c "$DAEMON status -D '$PGDATA'"
 	;;
   *)
 	# Print help