diff options
| author |   Elias Probst <mail@eliasprobst.eu> | 2015-10-24 23:08:36 +0200 |
|---|---|---|
| committer | Elias Probst <mail@eliasprobst.eu> | 2015-10-24 23:08:36 +0200 |
| commit | cff9b423cf44e94d3f370dc81acc53a1cdf78e34 (patch) | |
| tree | 3ba9e8759d11210ec93a21c4439b2b5905048929 /sys-apps | |
| parent | haskell-cabal.eclass: add missing '|| die' on pushd/popd (diff) | |
| download | gentoo-cff9b423cf44e94d3f370dc81acc53a1cdf78e34.tar.gz gentoo-cff9b423cf44e94d3f370dc81acc53a1cdf78e34.tar.bz2 gentoo-cff9b423cf44e94d3f370dc81acc53a1cdf78e34.zip | |
sys-apps/systemd: Update `noclean-tmp` patch
From `sys-apps/systemd-228` on, many `tmpfiles.d` definitions were
switched from `v` (subvolume) to `q` (subvolume with quota).
Package-Manager: portage-2.2.23
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/systemd/files/228-noclean-tmp.patch | 28 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 2 |
2 files changed, 29 insertions, 1 deletions
diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/228-noclean-tmp.patch new file mode 100644 index 000000000000..769aa04ccf6e --- /dev/null +++ b/sys-apps/systemd/files/228-noclean-tmp.patch @@ -0,0 +1,28 @@ +From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 25 Sep 2015 10:26:18 -0400 +Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp + +Bug: https://bugs.gentoo.org/490676 +--- + tmpfiles.d/tmp.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf +index 6bbd1aa..a361062 100644 +--- a/tmpfiles.d/tmp.conf ++++ b/tmpfiles.d/tmp.conf +@@ -8,8 +8,8 @@ + # See tmpfiles.d(5) for details + + # Clear tmp directories separately, to make them easier to override +-q /tmp 1777 root root 10d +-q /var/tmp 1777 root root 30d ++q /tmp 1777 root root ++q /var/tmp 1777 root root + + # Exclude namespace mountpoints created with PrivateTmp=yes + x /tmp/systemd-private-%b-* +-- +2.4.10 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 72c65e09e428..c196654d81c6 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -145,7 +145,7 @@ src_prepare() { # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - epatch "${FILESDIR}/226-noclean-tmp.patch" + epatch "${FILESDIR}/228-noclean-tmp.patch" epatch_user eautoreconf } |