Attachment #362106 for bug #489632

Lines 89-95 start() { Link Here

(-)a/postgresql.init (-2 / +2 lines)
89	--env "PGPORT=${configured_port}" \	89	--env "PGPORT=${configured_port}" \
90	${extraenv} \	90	${extraenv} \
91	--pidfile ${DATA_DIR%/}/postmaster.pid \	91	--pidfile ${DATA_DIR%/}/postmaster.pid \
92	--exec /usr/lib/postgresql-@SLOT@/bin/pg_ctl \	92	--exec /usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl \
93	-- start -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \	93	-- start -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \
94	-D ${PGDATA} -o "--data-directory=${DATA_DIR} ${PGOPTS}"	94	-D ${PGDATA} -o "--data-directory=${DATA_DIR} ${PGOPTS}"
95	local retval=$?	95	local retval=$?
Lines 124-130 stop() { Link Here
124		124
125	# Loops through nice, rude, and force quit in one go.	125	# Loops through nice, rude, and force quit in one go.
126	start-stop-daemon --stop \	126	start-stop-daemon --stop \
127	--exec /usr/lib/postgresql-@SLOT@/bin/postgres \	127	--exec /usr/@LIBDIR@/postgresql-@SLOT@/bin/postgres \
128	--retry ${retries} \	128	--retry ${retries} \
129	--pidfile ${DATA_DIR%/}/postmaster.pid	129	--pidfile ${DATA_DIR%/}/postmaster.pid
130		130

Lines 37-45 Environment=DATA_DIR=/var/lib/postgresql/@SLOT@/data Link Here

(-)a/postgresql.service (-4 / +3 lines)
37	# StandardOutput=syslog	37	# StandardOutput=syslog
38		38
39	ExecStartPre=/usr/bin/postgresql-@SLOT@-check-db-dir	39	ExecStartPre=/usr/bin/postgresql-@SLOT@-check-db-dir
40	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	40	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
41	ExecStop=/usr/lib/postgresql-@SLOT@/bin/pg_ctl stop -D ${DATA_DIR} -s -m fast	41	ExecStop=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl stop -D ${DATA_DIR} -s -m fast
42	ExecReload=/usr/lib/postgresql-@SLOT@/bin/pg_ctl reload -D ${DATA_DIR} -s	42	ExecReload=/usr/@LIBDIR@/postgresql-@SLOT@/bin/pg_ctl reload -D ${DATA_DIR} -s
43		43
44	# Give a reasonable amount of time for the server to start up/shut down	44	# Give a reasonable amount of time for the server to start up/shut down
45	TimeoutSec=300	45	TimeoutSec=300
46	-

Return to bug 489632