From 179eaab96dc5215970b2b3485cf77f1a58f9d337 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 13 Nov 2022 20:52:00 +0100 Subject: [PATCH 1/2] Remove gratuitous references to postmaster instead of postgres --- contrib/start-scripts/freebsd | 2 +- contrib/start-scripts/linux | 2 +- src/port/path.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd index 3323237a54b4..5e22b2d2f0e4 100644 --- a/contrib/start-scripts/freebsd +++ b/contrib/start-scripts/freebsd @@ -29,7 +29,7 @@ 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 # 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 PGCTL="$prefix/bin/pg_ctl" diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux index a7757162fc4b..9292855df716 100644 --- a/contrib/start-scripts/linux +++ b/contrib/start-scripts/linux @@ -61,7 +61,7 @@ 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 # 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 PGCTL="$prefix/bin/pg_ctl" diff --git a/src/port/path.c b/src/port/path.c index 05fe812f757b..fb64873c7a43 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' -- 2.38.1