Commit 7e9098b6 authored by Christoph Berg's avatar Christoph Berg

pg_createcluster: --start-conf should override the value from

createcluster.conf.
parent 5eb2c583
...@@ -8,6 +8,8 @@ postgresql-common (152) UNRELEASED; urgency=low ...@@ -8,6 +8,8 @@ postgresql-common (152) UNRELEASED; urgency=low
[ Christoph Berg ] [ Christoph Berg ]
* pg_virtualenv: Fix program name in manpage. * pg_virtualenv: Fix program name in manpage.
* pg_createcluster: --start-conf should override the value from
createcluster.conf.
-- Christoph Berg <christoph.berg@credativ.de> Tue, 10 Dec 2013 17:37:46 +0100 -- Christoph Berg <christoph.berg@credativ.de> Tue, 10 Dec 2013 17:37:46 +0100
......
...@@ -202,7 +202,7 @@ my $cleanup_cruft = 0; ...@@ -202,7 +202,7 @@ my $cleanup_cruft = 0;
# command line arguments # command line arguments
my $startconf = 'auto'; my $startconf = '';
my $createclusterconf = "$PgCommon::common_confdir/createcluster.conf"; my $createclusterconf = "$PgCommon::common_confdir/createcluster.conf";
my $environmentfile = "$PgCommon::common_confdir/environment"; my $environmentfile = "$PgCommon::common_confdir/environment";
...@@ -253,7 +253,7 @@ Options: ...@@ -253,7 +253,7 @@ Options:
exit 1; exit 1;
} }
$startconf = $defaultconf{'start_conf'} if ($defaultconf{'start_conf'}); $startconf ||= $defaultconf{'start_conf'} || 'auto';
error "Invalid --start-conf value: $startconf" if $startconf ne 'auto' && error "Invalid --start-conf value: $startconf" if $startconf ne 'auto' &&
$startconf ne 'manual' && $startconf ne 'disabled'; $startconf ne 'manual' && $startconf ne 'disabled';
......
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