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
This commit is contained in:
Pavel Raiskup 2014-01-21 15:41:35 +01:00
parent 7df4c0e471
commit a43ac073bc
2 changed files with 17 additions and 8 deletions

20
postgresql-setup Normal file → Executable file
View File

@ -48,12 +48,16 @@ Available operation mode:
e.g. from 9.1 to 9.2. e.g. from 9.1 to 9.2.
Environment: Environment:
PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to PGSETUP_INITDB_OPTIONS Options carried by this variable are passed to
subsequent call of \`initdb\` binary (see man subsequent call of \`initdb\` binary (see man
initdb(1)). This variable is used also during initdb(1)). This variable is used also during
'upgrade' mode because the new cluster is actually 'upgrade' mode because the new cluster is actually
re-initialized from the old one. re-initialized from the old one.
PGSETUP_DEBUG Set to '1' if you want to see debugging output." 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 # note that these options are useful at least for help2man processing
case "$1" in case "$1" in
@ -212,7 +216,9 @@ upgrade(){
'--new-datadir=$PGDATA' \ '--new-datadir=$PGDATA' \
--link \ --link \
'--old-port=$PGPORT' '--new-port=$PGPORT' \ '--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 if [ $? -ne 0 ]; then
# pg_upgrade failed # pg_upgrade failed
script_result=1 script_result=1

View File

@ -64,7 +64,7 @@ Summary: PostgreSQL client programs
Name: postgresql Name: postgresql
%global majorversion 9.3 %global majorversion 9.3
Version: 9.3.2 Version: 9.3.2
Release: 5%{?dist} Release: 6%{?dist}
# The PostgreSQL license is very similar to other MIT licenses, but the OSI # The PostgreSQL license is very similar to other MIT licenses, but the OSI
# recognizes it as an independent license, so we do as well. # recognizes it as an independent license, so we do as well.
@ -1130,6 +1130,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Jan 21 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.2-6
- add PGSETUP_PGUPGRADE_OPTIONS env var for postgresql-setup
* Mon Jan 20 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.2-5 * Mon Jan 20 2014 Pavel Raiskup <praiskup@redhat.com> - 9.3.2-5
- fix the postgresql-setup --version option - fix the postgresql-setup --version option