diff options
Diffstat (limited to 'sys-apps/systemd/systemd-254_rc2.ebuild')
| -rw-r--r-- | sys-apps/systemd/systemd-254_rc2.ebuild | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys-apps/systemd/systemd-254_rc2.ebuild b/sys-apps/systemd/systemd-254_rc2.ebuild index 79a152ddc472..494249a2edd6 100644 --- a/sys-apps/systemd/systemd-254_rc2.ebuild +++ b/sys-apps/systemd/systemd-254_rc2.ebuild @@ -240,6 +240,7 @@ src_unpack() { src_prepare() { local PATCHES=( + "${FILESDIR}/systemd-253-initrd-generators.patch" ) if ! use vanilla; then @@ -399,9 +400,6 @@ multilib_src_install_all() { keepdir /var/lib/systemd keepdir /var/log/journal - # Symlink /etc/sysctl.conf for easy migration. - dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf - if use pam; then newpamd "${FILESDIR}"/systemd-user.pam systemd-user fi @@ -465,6 +463,11 @@ migrate_locale() { } pkg_preinst() { + if [[ -e ${EROOT}/etc/sysctl.conf ]]; then + # Symlink /etc/sysctl.conf for easy migration. + dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf + fi + if ! use split-usr; then local dir for dir in bin sbin lib usr/sbin; do |