summaryrefslogtreecommitdiffstats
path: root/postgresql-setup.in
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2015-03-19 15:13:44 +0100
committerPavel Raiskup <praiskup@redhat.com>2015-03-19 15:16:32 +0100
commitba77bef2997e98db3a89a3c572189e70b953df67 (patch)
tree5d78caa0f47d372c0ddf19f79ba0de9e6b0df1ee /postgresql-setup.in
parent3d6941f236581c03e89d6e4c4c45c1e7a4e7fa23 (diff)
downloadpostgresql-setup-ba77bef2997e98db3a89a3c572189e70b953df67.tar.gz
postgresql-setup-ba77bef2997e98db3a89a3c572189e70b953df67.tar.xz
postgresql-setup-ba77bef2997e98db3a89a3c572189e70b953df67.zip
postgresql-setup: keep old-dir usable with pg_upgrade
* postgresql-setup.in (upgrade): Don't use --link option if we are not doing in-place upgrade. * NEWS: Document. * configure.ac: Bump minor version.
Diffstat (limited to 'postgresql-setup.in')
-rw-r--r--postgresql-setup.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/postgresql-setup.in b/postgresql-setup.in
index a8a1edc..8b30d71 100644
--- a/postgresql-setup.in
+++ b/postgresql-setup.in
@@ -253,6 +253,8 @@ upgrade()
cleanup=false
script_result=1
elif perform_initdb; then
+ $inplace && link_option=--link
+
# After creating the empty new-format database, do the upgrade
run_cmd_as_dbadmin "\
$scls_upgrade_hacks \
@@ -263,7 +265,7 @@ upgrade()
'--new-bindir=$PGENGINE' \
'--old-datadir=$pgdataold' \
'--new-datadir=$pgdata' \
- --link \
+ $link_option \
'--old-port=$PGPORT' '--new-port=$PGPORT' \
@PG_UPGRADE_BIN_USER_OPT@=postgres \
$PGSETUP_PGUPGRADE_OPTIONS" \