summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-10-04 20:16:11 +0000
committerMichał Górny <mgorny@gentoo.org>2012-10-04 20:16:11 +0000
commit76f8877f2f56a4a9a21eea0f1b4da6f52fb60010 (patch)
treed1aacf1f4e09c9c654c05b243e12a1a0153faf85 /sys-apps
parentVersion bump, bug #435840. (diff)
downloadgentoo-2-76f8877f2f56a4a9a21eea0f1b4da6f52fb60010.tar.gz
gentoo-2-76f8877f2f56a4a9a21eea0f1b4da6f52fb60010.tar.bz2
gentoo-2-76f8877f2f56a4a9a21eea0f1b4da6f52fb60010.zip
Preserve empty directories, per bug #437008.
(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/systemd/ChangeLog5
-rw-r--r--sys-apps/systemd/systemd-194.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog
index 8f1ff90c7969..5fee8fe4f0cb 100644
--- a/sys-apps/systemd/ChangeLog
+++ b/sys-apps/systemd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.55 2012/10/04 20:03:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.56 2012/10/04 20:16:11 mgorny Exp $
+
+ 04 Oct 2012; Michał Górny <mgorny@gentoo.org> systemd-194.ebuild:
+ Preserve empty directories, per bug #437008.
*systemd-194 (04 Oct 2012)
diff --git a/sys-apps/systemd/systemd-194.ebuild b/sys-apps/systemd/systemd-194.ebuild
index 4574177b6ca4..d96c622eea2c 100644
--- a/sys-apps/systemd/systemd-194.ebuild
+++ b/sys-apps/systemd/systemd-194.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-194.ebuild,v 1.1 2012/10/04 20:03:09 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-194.ebuild,v 1.2 2012/10/04 20:16:11 mgorny Exp $
EAPI=4
@@ -143,6 +143,10 @@ src_install() {
mv "${D}"/usr/lib/sysctl.d/coredump.conf \
"${D}"/etc/sysctl.d/coredump.conf.disabled || die
+ # Preserve empty dirs in /etc & /var, bug #437008
+ keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+ /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd
+
# Check whether we won't break user's system.
[[ -x "${D}"/bin/systemd ]] || die '/bin/systemd symlink broken, aborting.'
[[ -x "${D}"/usr/bin/systemd ]] || die '/usr/bin/systemd symlink broken, aborting.'