diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-24 15:21:55 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-24 15:21:55 +0100 |
| commit | 8c9d2a5b8f6cf1a66c0fda98f53c5ec82e672df6 (patch) | |
| tree | 3ace243a556abf80ae8e8fcca13925556dc9ca17 | |
| parent | [dev-db/pgpool2] Fix md5 malloc segfault (diff) | |
| download | scarabeus-8c9d2a5b8f6cf1a66c0fda98f53c5ec82e672df6.tar.gz scarabeus-8c9d2a5b8f6cf1a66c0fda98f53c5ec82e672df6.tar.bz2 scarabeus-8c9d2a5b8f6cf1a66c0fda98f53c5ec82e672df6.zip | |
[dev-db/pgpool2] update initscript to work more fine with baselayout1.
| -rw-r--r-- | dev-db/pgpool2/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/pgpool2/files/pgpool2.initd | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest index 42fd76f..c645a6e 100644 --- a/dev-db/pgpool2/Manifest +++ b/dev-db/pgpool2/Manifest @@ -1,6 +1,6 @@ AUX 3.0.1-fix_md5_malloc.patch 481 RMD160 6b1ad6d1202d14ea08b2e5088838e2c59ba06359 SHA1 2afb8feb36ae6dbe7ebcbfe00a4e245e6a376f61 SHA256 7de41b015436367e25a4cf4b2da792e0b0543ce766e85ca2c008eab78920da79 AUX pgpool2-tmpdir.patch 1806 RMD160 cfe4b124726f612953152c7cc40d028d8fef7800 SHA1 2dafdc37a24318b99bcdf8f983f12d048d8fd7f0 SHA256 431996a2d2e9acf99511c0315b51e478809b3b16818aefaf17bd9cb228975f2d -AUX pgpool2.initd 563 RMD160 ac3d50f4a90b6b69bf98ae73a55f4a34d5a30081 SHA1 5d7eced2cbd1a1f1149466ee398e28c774f26d15 SHA256 f8702c560b31110ea1a6581cfe37fe7b5b2fbe8af0188ace0b75e39a0e694aee +AUX pgpool2.initd 724 RMD160 5d3a435941959a6cf6e9b7774b32d37cce5b18ef SHA1 62b51c318bd943a2e5b21e54fa43a803293cb66c SHA256 4c536627dfbc4d05beb0a882d05c18a98fac5830800dacf0c46e52605ed9c2bf DIST pgpool-II-3.0.1.tar.gz 1226151 RMD160 3fa36d1d1d7c66dc6d291ba14905feb01342eb17 SHA1 1c72a271d65bd7b44b473b5020746808a056bf3d SHA256 3adfa1f92dee238abec2dd6880985da99b1e2d862e567994e9e2f2736a872ae0 EBUILD pgpool2-3.0.1.ebuild 1255 RMD160 4971a332823e614eed77aa225ab3d245df0bbcea SHA1 a9e41ba340683b35b1489a321be573f50f4e299d SHA256 157b245833bd4d80366bf9e14c8110d3ce991bd2c1414fb9a16d17ae51fba33d MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd index 4d98b2e..aa8ce47 100644 --- a/dev-db/pgpool2/files/pgpool2.initd +++ b/dev-db/pgpool2/files/pgpool2.initd @@ -7,11 +7,19 @@ depend() { need net } -OPTS="-f /etc/pgpool2/pgpool.conf -a /etc/pgpool2/pool_hba.conf -F /etc/pgpool2/pcp.conf -n" +ARGS="-f /etc/pgpool2/pgpool.conf -a /etc/pgpool2/pool_hba.conf -F /etc/pgpool2/pcp.conf -n" +LOGFILE="/var/log/pgpool2.log" start() { ebegin "Starting pgpool2" - start-stop-daemon --start --quiet --background --exec /usr/bin/pgpool -- ${OPTS} > /var/log/pgpool/pgpool.log 2>&1 + + if [ -n "${RC_UNAME}" ]; then + PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}" + else + PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1" + fi + + start-stop-daemon --start --quiet --background --exec /usr/bin/pgpool ${PARAMS} eend $? } |