floppym 14/07/27 15:00:52 Modified: systemd-215-r3.ebuild systemd-9999.ebuild ChangeLog Log: 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)
Revision Changes Path 1.2 sys-apps/systemd/systemd-215-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild?r1=1.1&r2=1.2 Index: systemd-215-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-215-r3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- systemd-215-r3.ebuild 25 Jul 2014 10:26:48 -0000 1.1 +++ systemd-215-r3.ebuild 27 Jul 2014 15:00:52 -0000 1.2 @@ -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 @@ 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 @@ # 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() { 1.129 sys-apps/systemd/systemd-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.129&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.129&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.128&r2=1.129 Index: systemd-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- systemd-9999.ebuild 21 Jul 2014 17:52:42 -0000 1.128 +++ systemd-9999.ebuild 27 Jul 2014 15:00:52 -0000 1.129 @@ -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 @@ 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 @@ # 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() { 1.293 sys-apps/systemd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.293&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.293&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.292&r2=1.293 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- ChangeLog 25 Jul 2014 10:26:48 -0000 1.292 +++ ChangeLog 27 Jul 2014 15:00:52 -0000 1.293 @@ -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 <flop...@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)
