[gentoo-commits] proj/pgsql-patches:initscripts commit in: /

[Mike Gilbert]

commit:     1df0c1913e44666192bdde8285c3e7e09ebff84b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 03:35:29 2013 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 03:35:29 2013 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=1df0c191

Replace /usr/lib with /usr/@LIBDIR@

---
 postgresql.init    | 4 ++--
 postgresql.service | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/postgresql.init b/postgresql.init
index 6e0e965..413558e 100755
--- a/postgresql.init
+++ b/postgresql.init
@@ -89,7 +89,7 @@ start() {
         --env "PGPORT=${configured_port}" \
         ${extraenv} \
         --pidfile ${DATA_DIR%/}/postmaster.pid \
-        --exec /usr/lib/postgresql-@SLOT@/bin/pg_ctl \
+        --exec /usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl \
         -- start -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \
                  -D ${PGDATA} -o "--data-directory=${DATA_DIR} ${PGOPTS}"
     local retval=$?
@@ -124,7 +124,7 @@ stop() {
 
     # Loops through nice, rude, and force quit in one go.
     start-stop-daemon --stop \
-        --exec /usr/lib/postgresql-@SLOT@/bin/postgres \
+        --exec /usr/@LIBDIR@/postgresql-@SLOT@/bin/postgres \
         --retry ${retries} \
         --pidfile ${DATA_DIR%/}/postmaster.pid
 

diff --git a/postgresql.service b/postgresql.service
index f8be8ac..20ed27a 100644
--- a/postgresql.service
+++ b/postgresql.service
@@ -37,9 +37,9 @@ Environment=DATA_DIR=/var/lib/postgresql/@SLOT@/data
 # StandardOutput=syslog
 
 ExecStartPre=/usr/bin/postgresql-@SLOT@-check-db-dir
-ExecStart=/usr/lib/postgresql-@SLOT@/bin/pg_ctl start -D ${DATA_DIR} -s -l 
${DATA_DIR}/postmaster.log -o "-p ${PGPORT} -D ${PGDATA} 
--data-directory=${DATA_DIR}" -w -t 300
-ExecStop=/usr/lib/postgresql-@SLOT@/bin/pg_ctl stop -D ${DATA_DIR} -s -m fast
-ExecReload=/usr/lib/postgresql-@SLOT@/bin/pg_ctl reload -D ${DATA_DIR} -s
+ExecStart=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl start -D ${DATA_DIR} -s 
-l ${DATA_DIR}/postmaster.log -o "-p ${PGPORT} -D ${PGDATA} 
--data-directory=${DATA_DIR}" -w -t 300
+ExecStop=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl stop -D ${DATA_DIR} -s -m 
fast
+ExecReload=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl reload -D ${DATA_DIR} -s
 
 # Give a reasonable amount of time for the server to start up/shut down
 TimeoutSec=300