pg.ddx.io  pgsql-hackers@postgresql.org mailing list archive  
help / color / mirror / Atom feed
From: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
To: pgsql-hackers <pgsql-hackers@postgresql.org>
Subject: drop postmaster symlink
Date: Wed, 23 Nov 2022 08:52:43 +0100
Message-ID: <ece84b69-8f94-8b88-925f-64207cb3a2f0@enterprisedb.com> (raw)

A little while ago we discussed briefly over in the meson thread whether 
we could remove the postmaster symlink [0].  The meson build system 
currently does not install a postmaster symlink.  (AFAICT, the MSVC 
build system does not either.)  So if we want to elevate the meson build 
system, we either need to add the postmaster symlink, or remove it from 
the other build system(s) as well.  Seeing that it's been deprecated for 
a long time, I propose we just remove it.  See attached patches.


[0]: 
https://www.postgresql.org/message-id/bfdf03c8-c24f-c5b1-474e-4c9a96210f46@enterprisedb.com

Attachments: download all (2 files, .tar.gz)

0001-Remove-gratuitous-references-to-postmaster-instead-o.patch (text/plain, 2.1K) download From 179eaab96dc5215970b2b3485cf77f1a58f9d337 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut <peter@eisentraut.org> 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
0002-Don-t-install-postmaster-symlink-anymore.patch (text/plain, 3.0K) download From 6118b4098a50b78ca7437938117cc3ab41b72e08 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut <peter@eisentraut.org> Date: Sun, 13 Nov 2022 20:52:56 +0100 Subject: [PATCH 2/2] Don't install postmaster symlink anymore Also remove man page. --- doc/src/sgml/ref/postmaster.sgml | 44 -------------------------------- doc/src/sgml/reference.sgml | 1 - src/backend/Makefile | 8 +----- 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 doc/src/sgml/ref/postmaster.sgml diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml deleted file mode 100644 index 7b544ed0b613..000000000000 --- a/doc/src/sgml/ref/postmaster.sgml +++ /dev/null @@ -1,44 +0,0 @@ -<!-- -doc/src/sgml/ref/postmaster.sgml -PostgreSQL documentation ---> - -<refentry id="app-postmaster"> - <indexterm zone="app-postmaster"> - <primary>postmaster</primary> - </indexterm> - - <refmeta> - <refentrytitle><application>postmaster</application></refentrytitle> - <manvolnum>1</manvolnum> - <refmiscinfo>Application</refmiscinfo> - </refmeta> - - <refnamediv> - <refname>postmaster</refname> - <refpurpose><productname>PostgreSQL</productname> database server</refpurpose> - </refnamediv> - - <refsynopsisdiv> - <cmdsynopsis> - <command>postmaster</command> - <arg rep="repeat"><replaceable>option</replaceable></arg> - </cmdsynopsis> - </refsynopsisdiv> - - <refsect1> - <title>Description</title> - - <para> - <command>postmaster</command> is a deprecated alias of <command>postgres</command>. - </para> - </refsect1> - - <refsect1> - <title>See Also</title> - - <para> - <xref linkend="app-postgres"/> - </para> - </refsect1> -</refentry> diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index a3b743e8c1e7..e11b4b613075 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -289,7 +289,6 @@ <title>PostgreSQL Server Applications</title> &pgupgrade; &pgwaldump; &postgres; - &postmaster; </reference> diff --git a/src/backend/Makefile b/src/backend/Makefile index 181c217fae4c..ed364543b74e 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -208,12 +208,6 @@ endif install-bin: postgres $(POSTGRES_IMP) installdirs $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' -ifneq ($(PORTNAME), win32) - @rm -f '$(DESTDIR)$(bindir)/postmaster$(X)' - ln -s postgres$(X) '$(DESTDIR)$(bindir)/postmaster$(X)' -else - $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postmaster$(X)' -endif ifeq ($(MAKE_EXPORTS), true) $(INSTALL_DATA) $(POSTGRES_IMP) '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)' $(INSTALL_PROGRAM) $(MKLDEXPORT) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh' @@ -242,7 +236,7 @@ endif ########################################################################## uninstall: - rm -f '$(DESTDIR)$(bindir)/postgres$(X)' '$(DESTDIR)$(bindir)/postmaster' + rm -f '$(DESTDIR)$(bindir)/postgres$(X)' ifeq ($(MAKE_EXPORTS), true) rm -f '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)' rm -f '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh' -- 2.38.1

view thread (27+ messages)  latest in thread

Message-ID: <ece84b69-8f94-8b88-925f-64207cb3a2f0@enterprisedb.com>
Permalink:  ../ece84b69-8f94-8b88-925f-64207cb3a2f0@enterprisedb.com/
Also on:    postgresql.org/message-id/ece84b69-8f94-8b88-925f-64207cb3a2f0@enterprisedb.com

 ·  · 

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: pgsql-hackers@postgresql.org
  Cc: peter.eisentraut@enterprisedb.com
  Subject: Re: drop postmaster symlink
  In-Reply-To: <ece84b69-8f94-8b88-925f-64207cb3a2f0@enterprisedb.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox