Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8126644

Browse files
committed
Remove gratuitous references to postmaster program
"postgres" has long been officially preferred over "postmaster" as the name of the program to invoke to run the server. Some example scripts and code comments still used the latter. Change those. Discussion: https://www.postgresql.org/message-id/flat/ece84b69-8f94-8b88-925f-64207cb3a2f0@enterprisedb.com
1 parent 6c6b497 commit 8126644

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

contrib/start-scripts/freebsd

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ prefix=/usr/local/pgsql
1616
# Data directory
1717
PGDATA="/usr/local/pgsql/data"
1818

19-
# Who to run the postmaster as, usually "postgres". (NOT "root")
19+
# Who to run postgres as, usually "postgres". (NOT "root")
2020
PGUSER=postgres
2121

2222
# Where to keep a log file
@@ -27,14 +27,14 @@ PGLOG="$PGDATA/serverlog"
2727
# The path that is to be used for the script
2828
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
2929

30-
# What to use to start up the postmaster. (If you want the script to wait
30+
# What to use to start up postgres. (If you want the script to wait
3131
# until the server has started, you could use "pg_ctl start" here.)
32-
DAEMON="$prefix/bin/postmaster"
32+
DAEMON="$prefix/bin/postgres"
3333

34-
# What to use to shut down the postmaster
34+
# What to use to shut down postgres
3535
PGCTL="$prefix/bin/pg_ctl"
3636

37-
# Only start if we can find the postmaster.
37+
# Only start if we can find postgres.
3838
test -x $DAEMON ||
3939
{
4040
echo "$DAEMON not found"

contrib/start-scripts/linux

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ prefix=/usr/local/pgsql
3434
# Data directory
3535
PGDATA="/usr/local/pgsql/data"
3636

37-
# Who to run the postmaster as, usually "postgres". (NOT "root")
37+
# Who to run postgres as, usually "postgres". (NOT "root")
3838
PGUSER=postgres
3939

4040
# Where to keep a log file
@@ -59,16 +59,16 @@ PGLOG="$PGDATA/serverlog"
5959
# The path that is to be used for the script
6060
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
6161

62-
# What to use to start up the postmaster. (If you want the script to wait
62+
# What to use to start up postgres. (If you want the script to wait
6363
# until the server has started, you could use "pg_ctl start" here.)
64-
DAEMON="$prefix/bin/postmaster"
64+
DAEMON="$prefix/bin/postgres"
6565

66-
# What to use to shut down the postmaster
66+
# What to use to shut down postgres
6767
PGCTL="$prefix/bin/pg_ctl"
6868

6969
set -e
7070

71-
# Only start if we can find the postmaster.
71+
# Only start if we can find postgres.
7272
test -x $DAEMON ||
7373
{
7474
echo "$DAEMON not found"

src/port/path.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ dir_strcmp(const char *s1, const char *s2)
651651
* For example:
652652
* target_path = '/usr/local/share/postgresql'
653653
* bin_path = '/usr/local/bin'
654-
* my_exec_path = '/opt/pgsql/bin/postmaster'
654+
* my_exec_path = '/opt/pgsql/bin/postgres'
655655
* Given these inputs, the common prefix is '/usr/local/', the tail of
656656
* bin_path is 'bin' which does match the last directory component of
657657
* my_exec_path, so we would return '/opt/pgsql/share/postgresql'

0 commit comments

Comments
 (0)