From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ReRwr-0001VN-PY for garchives@archives.gentoo.org; Sat, 24 Dec 2011 13:47:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD36B21C0DB; Sat, 24 Dec 2011 13:47:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ABFF021C0E1 for ; Sat, 24 Dec 2011 13:47:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35ABE1B4037 for ; Sat, 24 Dec 2011 13:47:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9F0848004C for ; Sat, 24 Dec 2011 13:47:33 +0000 (UTC) From: "Aaron Swenson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Swenson" Message-ID: <8f36b38642832f500e0bbcb83f0026b365a4d070.titanofold@gentoo> Subject: [gentoo-commits] proj/pgsql-patches:initscripts commit in: / X-VCS-Repository: proj/pgsql-patches X-VCS-Files: postgresql.init X-VCS-Directories: / X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron Swenson X-VCS-Revision: 8f36b38642832f500e0bbcb83f0026b365a4d070 Date: Sat, 24 Dec 2011 13:47:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d1a90c47-5db7-4c87-ace5-396d783da39c X-Archives-Hash: 737cf84c25229112e65002944b2fc380 commit: 8f36b38642832f500e0bbcb83f0026b365a4d070 Author: Aaron W. Swenson gentoo org> AuthorDate: Sat Dec 24 13:46:54 2011 +0000 Commit: Aaron Swenson gentoo org> CommitDate: Sat Dec 24 13:46:54 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pgsql-patches= .git;a=3Dcommit;h=3D8f36b386 Fixed passing environments issue. (Bug 394159) --- postgresql.init | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/postgresql.init b/postgresql.init index ed1dea4..363ea1a 100644 --- a/postgresql.init +++ b/postgresql.init @@ -69,7 +69,7 @@ checkconfig() { =20 checkpath -d -m 0770 -o postgres:postgres ${socket_path} if [ -e ${socket_path}/.s.PGSQL.${configured_port} ] ; then - eerror "Socket conflict." + eerror "Socket conflict." eerror "A server is already listening on:" eerror " ${socket_path}/.s.PGSQL.${configured_port}" eerror "HINT: Change PGPORT to listen on a different socket." @@ -84,16 +84,21 @@ start() { =20 rm -f ${DATA_DIR}/postmaster.pid =20 - local retval + local extraenv + local x + for x in ${PG_EXTRA_ENV} ; do + extraenv=3D"${extraenv} --env ${x}" + done =20 start-stop-daemon --start \ --user postgres \ --exec /usr/lib/postgresql-@SLOT@/bin/postgres \ - --env "PGPORT=3D${configured_port} ${PG_EXTRA_ENV}" \ + --env "PGPORT=3D${configured_port}" \ + ${extraenv} \ --wait $((${START_TIMEOUT}*1000)) \ --pidfile ${DATA_DIR}/postmaster.pid \ -- -D ${PGDATA} --data-directory=3D${DATA_DIR} --silent-mode=3Dtrue ${= PGOPTS} - retval=3D$? + local retval=3D$? =20 if [ $retval -ne 0 ] ; then eerror "Check the PostgreSQL @SLOT@ log for a detailed explanation of = the above error."