[postgresql] postgresql-setup: add PGSETUP_PGUPGRADE_OPTIONS
Pavel Raiskup
praiskup at fedoraproject.org
Wed Jan 22 08:35:24 UTC 2014
commit a43ac073bc5b173679ac555ac2421d45ae7b1c13
Author: Pavel Raiskup <praiskup at redhat.com>
Date: Tue Jan 21 15:41:35 2014 +0100
postgresql-setup: add PGSETUP_PGUPGRADE_OPTIONS
This allows user to use something like
PGSETUP_PGUPGRADE_OPTIONS="-o '-B 5MB'" to work-around badly set
kernel.shmax value.
Version: 9.3.2-6
postgresql-setup | 20 +++++++++++++-------
postgresql.spec | 5 ++++-
2 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/postgresql-setup b/postgresql-setup
old mode 100644
new mode 100755
index 8a56028..b30550a
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -48,12 +48,16 @@ Available operation mode:
e.g. from 9.1 to 9.2.
Environment:
- PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
- subsequent call of \`initdb\` binary (see man
- initdb(1)). This variable is used also during
- 'upgrade' mode because the new cluster is actually
- re-initialized from the old one.
- PGSETUP_DEBUG Set to '1' if you want to see debugging output."
+ PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
+ subsequent call of \`initdb\` binary (see man
+ initdb(1)). This variable is used also during
+ 'upgrade' mode because the new cluster is actually
+ re-initialized from the old one.
+ PGSETUP_PGUPGRADE_OPTIONS Options in this variable are passed next to the
+ subsequent call of \`pg_upgrade\`. For more info
+ about possible options please look at man
+ pg_upgrade(1).
+ PGSETUP_DEBUG Set to '1' if you want to see debugging output."
# note that these options are useful at least for help2man processing
case "$1" in
@@ -212,7 +216,9 @@ upgrade(){
'--new-datadir=$PGDATA' \
--link \
'--old-port=$PGPORT' '--new-port=$PGPORT' \
- --user=postgres" >> "$PGUPLOG" 2>&1 < /dev/null
+ --user=postgres \
+ $PGSETUP_PGUPGRADE_OPTIONS" \
+ >> "$PGUPLOG" 2>&1 < /dev/null
if [ $? -ne 0 ]; then
# pg_upgrade failed
script_result=1
diff --git a/postgresql.spec b/postgresql.spec
index 9eac6ce..8d894a3 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql
%global majorversion 9.3
Version: 9.3.2
-Release: 5%{?dist}
+Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well.
@@ -1130,6 +1130,9 @@ fi
%endif
%changelog
+* Tue Jan 21 2014 Pavel Raiskup <praiskup at redhat.com> - 9.3.2-6
+- add PGSETUP_PGUPGRADE_OPTIONS env var for postgresql-setup
+
* Mon Jan 20 2014 Pavel Raiskup <praiskup at redhat.com> - 9.3.2-5
- fix the postgresql-setup --version option
More information about the scm-commits
mailing list