diff options
| -rw-r--r-- | contrib/start-scripts/freebsd | 10 | ||||
| -rw-r--r-- | contrib/start-scripts/linux | 10 | ||||
| -rw-r--r-- | src/port/path.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd index 3323237a54b..ed4f9ba6203 100644 --- a/contrib/start-scripts/freebsd +++ b/contrib/start-scripts/freebsd @@ -16,7 +16,7 @@ prefix=/usr/local/pgsql # Data directory PGDATA="/usr/local/pgsql/data" -# Who to run the postmaster as, usually "postgres". (NOT "root") +# Who to run postgres as, usually "postgres". (NOT "root") PGUSER=postgres # Where to keep a log file @@ -27,14 +27,14 @@ PGLOG="$PGDATA/serverlog" # The path that is to be used for the script PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# What to use to start up the postmaster. (If you want the script to wait +# What to use to start up postgres. (If you want the script to wait # until the server has started, you could use "pg_ctl start" here.) -DAEMON="$prefix/bin/postmaster" +DAEMON="$prefix/bin/postgres" -# What to use to shut down the postmaster +# What to use to shut down postgres PGCTL="$prefix/bin/pg_ctl" -# Only start if we can find the postmaster. +# Only start if we can find postgres. test -x $DAEMON || { echo "$DAEMON not found" diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux index a7757162fc4..ca01e96a62b 100644 --- a/contrib/start-scripts/linux +++ b/contrib/start-scripts/linux @@ -34,7 +34,7 @@ prefix=/usr/local/pgsql # Data directory PGDATA="/usr/local/pgsql/data" -# Who to run the postmaster as, usually "postgres". (NOT "root") +# Who to run postgres as, usually "postgres". (NOT "root") PGUSER=postgres # Where to keep a log file @@ -59,16 +59,16 @@ PGLOG="$PGDATA/serverlog" # The path that is to be used for the script PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -# What to use to start up the postmaster. (If you want the script to wait +# What to use to start up postgres. (If you want the script to wait # until the server has started, you could use "pg_ctl start" here.) -DAEMON="$prefix/bin/postmaster" +DAEMON="$prefix/bin/postgres" -# What to use to shut down the postmaster +# What to use to shut down postgres PGCTL="$prefix/bin/pg_ctl" set -e -# Only start if we can find the postmaster. +# Only start if we can find postgres. test -x $DAEMON || { echo "$DAEMON not found" diff --git a/src/port/path.c b/src/port/path.c index 401a3243bc8..65c7943fee1 100644 --- a/src/port/path.c +++ b/src/port/path.c @@ -651,7 +651,7 @@ dir_strcmp(const char *s1, const char *s2) * For example: * target_path = '/usr/local/share/postgresql' * bin_path = '/usr/local/bin' - * my_exec_path = '/opt/pgsql/bin/postmaster' + * my_exec_path = '/opt/pgsql/bin/postgres' * Given these inputs, the common prefix is '/usr/local/', the tail of * bin_path is 'bin' which does match the last directory component of * my_exec_path, so we would return '/opt/pgsql/share/postgresql' |