diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-07-27 15:00:52 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-07-27 15:00:52 +0000 |
| commit | 6892d5bfb3cda737ca19c4443ae1d5a982ae295f (patch) | |
| tree | 2c027ed9866fe493ed7a40571c80a6063cfd7c75 /sys-apps | |
| parent | Version bump; Drop old, thanks to Nikoli (diff) | |
| download | gentoo-2-6892d5bfb3cda737ca19c4443ae1d5a982ae295f.tar.gz gentoo-2-6892d5bfb3cda737ca19c4443ae1d5a982ae295f.tar.bz2 gentoo-2-6892d5bfb3cda737ca19c4443ae1d5a982ae295f.zip | |
Don't install /etc/systemd/system/network-online.target.wants, bug 518318 by poncho.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/systemd/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-215-r3.ebuild | 14 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 14 |
3 files changed, 22 insertions, 13 deletions
diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index 995bef8af6e3..59066d9683db 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,11 @@ # 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.292 2014/07/25 10:26:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.293 2014/07/27 15:00:52 floppym Exp $ + + 27 Jul 2014; Mike Gilbert <floppym@gentoo.org> systemd-215-r3.ebuild, + systemd-9999.ebuild: + Don't install /etc/systemd/system/network-online.target.wants, bug 518318 by + poncho. *systemd-215-r3 (25 Jul 2014) diff --git a/sys-apps/systemd/systemd-215-r3.ebuild b/sys-apps/systemd/systemd-215-r3.ebuild index 89ce5199d5fc..e58818141417 100644 --- a/sys-apps/systemd/systemd-215-r3.ebuild +++ b/sys-apps/systemd/systemd-215-r3.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-215-r3.ebuild,v 1.1 2014/07/25 10:26:48 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v 1.2 2014/07/27 15:00:52 floppym Exp $ EAPI=5 @@ -312,11 +312,6 @@ multilib_src_install() { if multilib_is_native_abi; then emake "${mymakeopts[@]}" install - # Even with --enable-networkd, it's not right to have this running by default - # when it's unconfigured. - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service else mymakeopts+=( install-libLTLIBRARIES @@ -360,6 +355,13 @@ multilib_src_install_all() { # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf + + # If we install these symlinks, there is no way for the sysadmin to remove them + # permanently. + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service + rm -rf "${D}"/etc/systemd/system/network-online.target.wants } migrate_locale() { diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 89bc8d95e609..4ac00846e523 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.128 2014/07/21 17:52:42 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.129 2014/07/27 15:00:52 floppym Exp $ EAPI=5 @@ -324,11 +324,6 @@ multilib_src_install() { if multilib_is_native_abi; then emake "${mymakeopts[@]}" install - # Even with --enable-networkd, it's not right to have this running by default - # when it's unconfigured. - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service else mymakeopts+=( install-libLTLIBRARIES @@ -366,6 +361,13 @@ multilib_src_install_all() { # Symlink /etc/sysctl.conf for easy migration. dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf + + # If we install these symlinks, there is no way for the sysadmin to remove them + # permanently. + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service + rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service + rm -rf "${D}"/etc/systemd/system/network-online.target.wants } migrate_locale() { |