Commit 0b0e4579 authored by Christoph Berg's avatar Christoph Berg

pg_ctlcluster: Skip systemctl redirect with --bindir.

parent ef0b5ae8
postgresql-common (172) UNRELEASED; urgency=medium
* pg_buildext: Mute diff warning about missing debian/tests/control.in.
* pg_ctlcluster: Skip systemctl redirect with --bindir.
-- Christoph Berg <myon@debian.org> Sat, 19 Dec 2015 15:06:46 +0100
......
......@@ -403,7 +403,7 @@ if (not $skip_systemctl_redirect and getppid() != 1 and # not run from init
my $unit_active = $? == 0;
# if extra options are given, proceed with pg_ctlcluster with a warning
if (@postmaster_auxoptions != 0 or @pg_ctl_opts_from_cli != 0) { # extra options given
if (@postmaster_auxoptions != 0 or @pg_ctl_opts_from_cli != 0 or $bindir) { # extra options given
print "Notice: extra pg_ctl/postgres options given, bypassing systemctl for $action operation\n" if (-t 1);
# if we are root, redirect to systemctl unless stopping a cluster running outside systemd
} elsif ($> == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment