diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-10-22 15:02:44 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-10-22 15:02:44 +0000 |
| commit | d2f0436693dead9389c8fc23359c19ecaa460cf8 (patch) | |
| tree | 06f487f69dd5197802edf56cae36ef5b11ce623d | |
| parent | fix bashcomp, bug 526282. thanks Necoro (diff) | |
| download | gentoo-2-d2f0436693dead9389c8fc23359c19ecaa460cf8.tar.gz gentoo-2-d2f0436693dead9389c8fc23359c19ecaa460cf8.tar.bz2 gentoo-2-d2f0436693dead9389c8fc23359c19ecaa460cf8.zip | |
Use keepdir /var/log/journal/remote instead of removing it.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-216-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 6d1df6bd34b6..e036f757bd9a 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.316 2014/10/20 22:00:04 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.317 2014/10/22 15:02:44 floppym Exp $ + + 22 Oct 2014; Mike Gilbert <floppym@gentoo.org> systemd-216-r1.ebuild, + systemd-9999.ebuild: + Use keepdir /var/log/journal/remote instead of removing it. 20 Oct 2014; Mike Gilbert <floppym@gentoo.org> systemd-216-r1.ebuild, systemd-9999.ebuild: diff --git a/sys-apps/systemd/systemd-216-r1.ebuild b/sys-apps/systemd/systemd-216-r1.ebuild index 0aa262154d89..b26b7790887b 100644 --- a/sys-apps/systemd/systemd-216-r1.ebuild +++ b/sys-apps/systemd/systemd-216-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild,v 1.4 2014/10/20 22:00:04 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r1.ebuild,v 1.5 2014/10/22 15:02:44 floppym Exp $ EAPI=5 @@ -336,10 +336,8 @@ multilib_src_install_all() { # 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 - - # Remove empty journal directory. - rmdir "${D}"/var/log/journal || die + /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ + /var/log/journal/remote # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index eeb57d37e14b..30089420a6f1 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.143 2014/10/20 22:00:04 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.144 2014/10/22 15:02:44 floppym Exp $ EAPI=5 @@ -353,10 +353,8 @@ multilib_src_install_all() { # 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 - - # Remove empty journal directory. - rmdir "${D}"/var/log/journal || die + /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ + /var/log/journal/remote # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |