[gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/files/, dev-db/postgresql/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/files/, dev-db/postgresql/
Date: Sun, 25 Oct 2015 21:10:06 +0000 (UTC)	[thread overview]
Message-ID: <1445802300.4d732339911b0ea2aa9b994efe17a92d42281504.mgorny@gentoo> (raw)

commit:     4d732339911b0ea2aa9b994efe17a92d42281504
Author:     Elias Probst <mail <AT> eliasprobst <DOT> eu>
AuthorDate: Fri Oct 23 21:25:09 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 25 19:45:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d732339

dev-db/postgresql: Handle RuntimeDirectory in systemd unit

Instead of using a separate `tmpfiles.d` definition to create
`/run/postgresql`, let the service unit take care of it on its
own. This prevents situations where the postgresql service can't
start because `systemd-tmpfiles` wasn't run yet.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=563122

Package-Manager: portage-2.2.23

 dev-db/postgresql/files/postgresql.service                            | 4 ++++
 dev-db/postgresql/files/postgresql.tmpfilesd                          | 1 -
 .../{postgresql-9.0.23.ebuild => postgresql-9.0.23-r1.ebuild}         | 2 --
 .../{postgresql-9.1.19.ebuild => postgresql-9.1.19-r1.ebuild}         | 2 --
 .../{postgresql-9.2.14.ebuild => postgresql-9.2.14-r1.ebuild}         | 2 --
 .../{postgresql-9.3.10.ebuild => postgresql-9.3.10-r1.ebuild}         | 2 --
 .../{postgresql-9.4.5.ebuild => postgresql-9.4.5-r1.ebuild}           | 2 --
 .../{postgresql-9.5_beta1.ebuild => postgresql-9.5_beta1-r1.ebuild}   | 2 --
 dev-db/postgresql/postgresql-9999.ebuild                              | 2 --
 9 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/dev-db/postgresql/files/postgresql.service b/dev-db/postgresql/files/postgresql.service
index 20ed27a..a607169 100644
--- a/dev-db/postgresql/files/postgresql.service
+++ b/dev-db/postgresql/files/postgresql.service
@@ -47,5 +47,9 @@ TimeoutSec=300
 # Disable OOM kill on the postmaster
 OOMScoreAdjust=-1000
 
+# Make sure the required runtimedir is present
+RuntimeDirectory=postgresql
+RuntimeDirectoryMode=1775
+
 [Install]
 WantedBy=multi-user.target

diff --git a/dev-db/postgresql/files/postgresql.tmpfilesd b/dev-db/postgresql/files/postgresql.tmpfilesd
deleted file mode 100644
index 26f44ef..0000000
--- a/dev-db/postgresql/files/postgresql.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /run/postgresql 1775 postgres postgres -

diff --git a/dev-db/postgresql/postgresql-9.0.23.ebuild b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
similarity index 99%
rename from dev-db/postgresql/postgresql-9.0.23.ebuild
rename to dev-db/postgresql/postgresql-9.0.23-r1.ebuild
index 174a686..ac1b4fe 100644
--- a/dev-db/postgresql/postgresql-9.0.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
@@ -198,8 +198,6 @@ src_install() {
 			"${FILESDIR}/${PN}.service" | \
 			systemd_newunit - ${PN}-${SLOT}.service
 
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session

diff --git a/dev-db/postgresql/postgresql-9.1.19.ebuild b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
similarity index 99%
rename from dev-db/postgresql/postgresql-9.1.19.ebuild
rename to dev-db/postgresql/postgresql-9.1.19-r1.ebuild
index e2ab37e..817622c 100644
--- a/dev-db/postgresql/postgresql-9.1.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
@@ -202,8 +202,6 @@ src_install() {
 			"${FILESDIR}/${PN}.service" | \
 			systemd_newunit - ${PN}-${SLOT}.service
 
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session

diff --git a/dev-db/postgresql/postgresql-9.2.14.ebuild b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
similarity index 99%
rename from dev-db/postgresql/postgresql-9.2.14.ebuild
rename to dev-db/postgresql/postgresql-9.2.14-r1.ebuild
index 6ec39d3..83a2fa7 100644
--- a/dev-db/postgresql/postgresql-9.2.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
@@ -196,8 +196,6 @@ src_install() {
 			"${FILESDIR}/${PN}.service" | \
 			systemd_newunit - ${PN}-${SLOT}.service
 
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session

diff --git a/dev-db/postgresql/postgresql-9.3.10.ebuild b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
similarity index 99%
rename from dev-db/postgresql/postgresql-9.3.10.ebuild
rename to dev-db/postgresql/postgresql-9.3.10-r1.ebuild
index dc084ca..2367c97 100644
--- a/dev-db/postgresql/postgresql-9.3.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
@@ -196,8 +196,6 @@ src_install() {
 			"${FILESDIR}/${PN}.service" | \
 			systemd_newunit - ${PN}-${SLOT}.service
 
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session

diff --git a/dev-db/postgresql/postgresql-9.4.5.ebuild b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
similarity index 99%
rename from dev-db/postgresql/postgresql-9.4.5.ebuild
rename to dev-db/postgresql/postgresql-9.4.5-r1.ebuild
index a411b38..d705b10 100644
--- a/dev-db/postgresql/postgresql-9.4.5.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
@@ -228,8 +228,6 @@ src_install() {
 			"${FILESDIR}/${PN}.service" | \
 			systemd_newunit - ${PN}-${SLOT}.service
 
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session

diff --git a/dev-db/postgresql/postgresql-9.5_beta1.ebuild b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
similarity index 99%
rename from dev-db/postgresql/postgresql-9.5_beta1.ebuild
rename to dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
index 50d2cec..cc14882 100644
--- a/dev-db/postgresql/postgresql-9.5_beta1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5_beta1-r1.ebuild
@@ -234,8 +234,6 @@ src_install() {
 			"${FILESDIR}/${PN}.service" | \
 			systemd_newunit - ${PN}-${SLOT}.service
 
-		systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session

diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 36e35fd..c2fe866 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -186,8 +186,6 @@ src_install() {
 		"${FILESDIR}/${PN}.service" | \
 		systemd_newunit - ${PN}-${SLOT}.service
 
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
 	newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
 
 	use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session

next             reply	other threads:[~2015-10-25 21:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-25 21:10 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-04-17 15:48 [gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/files/, dev-db/postgresql/ Aaron Swenson
2017-05-31 16:48 Patrice Clement
2017-07-13 15:34 Aaron Swenson
2017-08-10 15:16 Aaron Swenson
2018-02-11 15:55 Aaron Swenson
2018-05-20  9:42 Aaron Swenson
2019-06-15 10:58 Aaron W. Swenson
2020-08-14  0:53 Aaron W. Swenson
2020-08-14  1:59 Aaron W. Swenson
2021-08-13 11:37 Marek Szuba
2022-03-24  6:28 罗百科
2022-08-15 16:53 Aaron W. Swenson
2022-08-18 11:26 Aaron W. Swenson

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:20ed27a dfblob:a607169 dfblob:26f44ef dfblob:174a686
dfblob:ac1b4fe dfblob:e2ab37e dfblob:817622c dfblob:6ec39d3
dfblob:83a2fa7 dfblob:dc084ca dfblob:2367c97 dfblob:a411b38
dfblob:d705b10 dfblob:50d2cec dfblob:cc14882 dfblob:36e35fd
dfblob:c2fe866 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-db/postgresql/files/, dev-db/postgresql/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1445802300.4d732339911b0ea2aa9b994efe17a92d42281504.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox