Change format of postmaster.opts.default.

Executable file name (postmaster) no more included in the file.

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index 9839ecc0e387eb3dc5e2f36cda1792c295d0b65c..9de6eb3ab8cac0c0ccc3a3467e35e17df58a0da9 100755 (executable)
--- 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 fea6bf660e5eed649e91bc1e9fb19faacfe44b28..d1aef133fa8e090851265907aa18e31b3471775a 100644 (file)
--- a/src/bin/pg_ctl/postmaster.opts.default.sample
+++ b/src/bin/pg_ctl/postmaster.opts.default.sample
@@ -1,2 +1 @@
-postmaster
 -S