From ba77bef2997e98db3a89a3c572189e70b953df67 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 19 Mar 2015 15:13:44 +0100
Subject: 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.
---
 postgresql-setup.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'postgresql-setup.in')

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" \
-- 
cgit