diff options
| author | Peter Eisentraut | 2001-04-19 19:17:44 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2001-04-19 19:17:44 +0000 |
| commit | f3d90e1c8e7cd8595df1d75c19f0d8aeea71f8f0 (patch) | |
| tree | 983ae432c96b83c4bec81afc77de24e922803ad1 | |
| parent | 940cfdafd64b090d61fad702f6334d6e8ca4d2a3 (diff) | |
Pass -D option to pg_ctl because export PGDATA won't be preserved across
'su -l'.
Reported by <[email protected]>.
| -rw-r--r-- | contrib/start-scripts/freebsd | 10 | ||||
| -rw-r--r-- | contrib/start-scripts/linux | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd index 601dbb98d0..c72239ec42 100644 --- a/contrib/start-scripts/freebsd +++ b/contrib/start-scripts/freebsd @@ -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 0c8364508e..87a5419c5b 100644 --- a/contrib/start-scripts/linux +++ b/contrib/start-scripts/linux @@ -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 |