From b2ff7d08ad5507d34cc1f765008f08a9d9ba6c8e Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Sun, 23 Jan 2000 08:20:24 +0000
Subject: [PATCH] Change format of postmaster.opts.default. Executable file
 name (postmaster) no more included in the file.

---
 src/bin/pg_ctl/pg_ctl.sh                      | 6 +++---
 src/bin/pg_ctl/postmaster.opts.default.sample | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index 9839ecc0e3..9de6eb3ab8 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.6 2000/01/09 12:06:52 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.7 2000/01/23 08:20:24 ishii Exp $
 #
 #-------------------------------------------------------------------------
 CMDNAME=`basename $0`
@@ -214,9 +214,9 @@ if [ $op = "start" -o $op = "restart" ];then
     # no -o given
     if [ -z "$POSTOPTS" ];then
 	if [ $op = "start" ];then
-	    # if we are in start mode, then look postmaster.opts.default
+	    # if we are in start mode, then look for postmaster.opts.default
 	    if [ -f $DEFPOSTOPTS ];then
-		eval `cat $DEFPOSTOPTS` &
+		eval "$po_path `cat $DEFPOSTOPTS`" &
 	    else
 		$ECHO "$CMDNAME: Can't find $DEFPOSTOPTS"
 		exit 1
diff --git a/src/bin/pg_ctl/postmaster.opts.default.sample b/src/bin/pg_ctl/postmaster.opts.default.sample
index fea6bf660e..d1aef133fa 100644
--- a/src/bin/pg_ctl/postmaster.opts.default.sample
+++ b/src/bin/pg_ctl/postmaster.opts.default.sample
@@ -1,2 +1 @@
-postmaster
 -S
-- 
2.11.0