diff options
author | Timo Teräs <timo.teras@iki.fi> | 2014-06-04 14:52:42 +0300 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2014-06-04 14:52:42 +0300 |
commit | 8f9cc28a3ff039ab11211c58f014aa1a344f1b91 (patch) | |
tree | 61bbc296070a8c129b99f9f0b002ddb9077c2f89 | |
parent | 0633af6fa93dfaf44183fb30d117a29e2ffce4ac (diff) | |
download | alpine_aports-8f9cc28a3ff039ab11211c58f014aa1a344f1b91.tar.bz2 alpine_aports-8f9cc28a3ff039ab11211c58f014aa1a344f1b91.tar.xz alpine_aports-8f9cc28a3ff039ab11211c58f014aa1a344f1b91.zip |
main/postgresql: remove invalid and redundant options from init.d
makes postgres start again. fixes #2984
-rw-r--r-- | main/postgresql/APKBUILD | 8 | ||||
-rw-r--r-- | main/postgresql/postgresql.initd | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD index 6c56ccd888..dc31dccd54 100644 --- a/main/postgresql/APKBUILD +++ b/main/postgresql/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=postgresql | 2 | pkgname=postgresql |
3 | pkgver=9.3.4 | 3 | pkgver=9.3.4 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="A sophisticated object-relational DBMS" | 5 | pkgdesc="A sophisticated object-relational DBMS" |
6 | url="http://www.postgresql.org/" | 6 | url="http://www.postgresql.org/" |
7 | arch="all" | 7 | arch="all" |
@@ -88,19 +88,19 @@ contrib() { | |||
88 | 88 | ||
89 | md5sums="d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2 | 89 | md5sums="d0a41f54c377b2d2fab4a003b0dac762 postgresql-9.3.4.tar.bz2 |
90 | 00f0fc07fb8447f7e174c4cee0661722 initdb.patch | 90 | 00f0fc07fb8447f7e174c4cee0661722 initdb.patch |
91 | 01cc8d4a4cbc77a7b6f84344155232d5 postgresql.initd | 91 | a5ee4dc50d690efc124c8a4986458e59 postgresql.initd |
92 | 9741f3d5f0611ce39f85f70f2cab2b00 postgresql.confd | 92 | 9741f3d5f0611ce39f85f70f2cab2b00 postgresql.confd |
93 | d2a51db4436e550d56bb1e96699faef4 pg-restore.initd | 93 | d2a51db4436e550d56bb1e96699faef4 pg-restore.initd |
94 | bf45384752b320b369f1425939763178 pg-restore.confd" | 94 | bf45384752b320b369f1425939763178 pg-restore.confd" |
95 | sha256sums="9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621 postgresql-9.3.4.tar.bz2 | 95 | sha256sums="9ee819574dfc8798a448dc23a99510d2d8924c2f8b49f8228cd77e4efc8a6621 postgresql-9.3.4.tar.bz2 |
96 | 36a65229bf31b20a95ff2e2cac1a6ece0c61afdcd0b544759ad12f34d1b98a39 initdb.patch | 96 | 36a65229bf31b20a95ff2e2cac1a6ece0c61afdcd0b544759ad12f34d1b98a39 initdb.patch |
97 | a2ed1adeb70b0098e7e50f74aa601175b56f643a53836d8d325fcac07eb9e614 postgresql.initd | 97 | 43a2e06ccd37d2d5ee62ac68bd33bdb65bb193675a58132273cc066579b47e45 postgresql.initd |
98 | 7fd24959d5fa49b1405cb94438665f060335266ea20224f234c6bcb5dce3403b postgresql.confd | 98 | 7fd24959d5fa49b1405cb94438665f060335266ea20224f234c6bcb5dce3403b postgresql.confd |
99 | d73701e9a5fff2d7088ee50d7c7fc8a2fa19f651237d8b880c579e0e09515609 pg-restore.initd | 99 | d73701e9a5fff2d7088ee50d7c7fc8a2fa19f651237d8b880c579e0e09515609 pg-restore.initd |
100 | 31414d8b57c4cd2116b6014de3f1329875151910753fbd616daec4554866d02f pg-restore.confd" | 100 | 31414d8b57c4cd2116b6014de3f1329875151910753fbd616daec4554866d02f pg-restore.confd" |
101 | sha512sums="acf4605216e9b4b48531bc23e152f1f80476a5feea3004a98fe720a16f10c70cc01940d28af236e079c2a3eee42d6b02ae651269f876eb44346983edfa69e0c4 postgresql-9.3.4.tar.bz2 | 101 | sha512sums="acf4605216e9b4b48531bc23e152f1f80476a5feea3004a98fe720a16f10c70cc01940d28af236e079c2a3eee42d6b02ae651269f876eb44346983edfa69e0c4 postgresql-9.3.4.tar.bz2 |
102 | 6f7fdceb1a5aba3f00894ae88afdf25e5f9c7a0ffc00b11211011a6415ea73639d6a67f516cab66c6487484bab26ded3c93471d6d41ac0d3822926c22274f2ba initdb.patch | 102 | 6f7fdceb1a5aba3f00894ae88afdf25e5f9c7a0ffc00b11211011a6415ea73639d6a67f516cab66c6487484bab26ded3c93471d6d41ac0d3822926c22274f2ba initdb.patch |
103 | 215d3e2a08a018148f901a80e4c915b314188d50874e465a2181259b0dd5f95d4b18e2e3a9e428a1cdff03f51f8ce67245f4503157d542e11519d2d9fba08a80 postgresql.initd | 103 | 3c6a87d21e15337c20aec9fecf87bb01af72f26ff9a1c58339ab0415500290581fd6017536a968380630746a89ff74620b06f906ea90dc39889df8ce2335978c postgresql.initd |
104 | 17f0a81cc06a76aeadd0b1bd14cffffee2c64405615ef13895403e854569f936b295c54786d2c5aa84dc617edb615257c05a8e04185151f88a4e762eb7e67844 postgresql.confd | 104 | 17f0a81cc06a76aeadd0b1bd14cffffee2c64405615ef13895403e854569f936b295c54786d2c5aa84dc617edb615257c05a8e04185151f88a4e762eb7e67844 postgresql.confd |
105 | e7f8e08edc54c54c513786f8ea34cb6deac61106cff8004fbe56b9b32b22a4d5acdff256e864ef242b91d7704595fd9ec27ccbcef70da5d5c85f049d92304bf2 pg-restore.initd | 105 | e7f8e08edc54c54c513786f8ea34cb6deac61106cff8004fbe56b9b32b22a4d5acdff256e864ef242b91d7704595fd9ec27ccbcef70da5d5c85f049d92304bf2 pg-restore.initd |
106 | c14a5684e914abb3b0ee71bbf15eed71a9264deacaa404a6e3af6bfc330d93e7598624d0ed11a94263106cc660f7f54c8ff57e759033cf606a795f69ff6c1c7c pg-restore.confd" | 106 | c14a5684e914abb3b0ee71bbf15eed71a9264deacaa404a6e3af6bfc330d93e7598624d0ed11a94263106cc660f7f54c8ff57e759033cf606a795f69ff6c1c7c pg-restore.confd" |
diff --git a/main/postgresql/postgresql.initd b/main/postgresql/postgresql.initd index 6771c85045..2ca8420e10 100644 --- a/main/postgresql/postgresql.initd +++ b/main/postgresql/postgresql.initd | |||
@@ -65,7 +65,7 @@ start() { | |||
65 | -- \ | 65 | -- \ |
66 | start -s -w -t ${START_TIMEOUT:-10} \ | 66 | start -s -w -t ${START_TIMEOUT:-10} \ |
67 | -l ${PGDATA}/postmaster.log \ | 67 | -l ${PGDATA}/postmaster.log \ |
68 | -D ${PGDATA} -o "--data-directory=${PGDATA} $PGOPTS" | 68 | -D ${PGDATA} -o "$PGOPTS" |
69 | retval=$? | 69 | retval=$? |
70 | 70 | ||
71 | if [ $retval -ne 0 ] ; then | 71 | if [ $retval -ne 0 ] ; then |