* [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild systemd-218-r2.ebuild ChangeLog
@ 2015-02-02 21:23 Mike Gilbert (floppym)
0 siblings, 0 replies; only message in thread
From: Mike Gilbert (floppym) @ 2015-02-02 21:23 UTC (permalink / raw
To: gentoo-commits
floppym 15/02/02 21:23:09
Modified: systemd-9999.ebuild systemd-218-r2.ebuild ChangeLog
Log:
Die if we fail to remove links in /etc.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.156 sys-apps/systemd/systemd-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.155&r2=1.156
Index: systemd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- systemd-9999.ebuild 2 Feb 2015 21:14:51 -0000 1.155
+++ systemd-9999.ebuild 2 Feb 2015 21:23:09 -0000 1.156
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.155 2015/02/02 21:14:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.156 2015/02/02 21:23:09 floppym Exp $
EAPI=5
@@ -377,10 +377,10 @@
# 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/sysinit.target.wants/systemd-timesyncd.service
- rm -rf "${D}"/etc/systemd/system/network-online.target.wants
+ rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+ rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+ rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+ rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
}
migrate_locale() {
1.3 sys-apps/systemd/systemd-218-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild?r1=1.2&r2=1.3
Index: systemd-218-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- systemd-218-r2.ebuild 2 Feb 2015 21:14:51 -0000 1.2
+++ systemd-218-r2.ebuild 2 Feb 2015 21:23:09 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild,v 1.2 2015/02/02 21:14:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild,v 1.3 2015/02/02 21:23:09 floppym Exp $
EAPI=5
@@ -354,10 +354,10 @@
# 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/sysinit.target.wants/systemd-timesyncd.service
- rm -rf "${D}"/etc/systemd/system/network-online.target.wants
+ rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+ rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+ rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+ rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
}
migrate_locale() {
1.345 sys-apps/systemd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.345&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.345&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.344&r2=1.345
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- ChangeLog 2 Feb 2015 21:14:51 -0000 1.344
+++ ChangeLog 2 Feb 2015 21:23:09 -0000 1.345
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/systemd
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.344 2015/02/02 21:14:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.345 2015/02/02 21:23:09 floppym Exp $
+
+ 02 Feb 2015; Mike Gilbert <floppym@gentoo.org> systemd-218-r2.ebuild,
+ systemd-9999.ebuild:
+ Die if we fail to remove links in /etc.
02 Feb 2015; Mike Gilbert <floppym@gentoo.org> systemd-218-r2.ebuild,
systemd-9999.ebuild:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-02-02 21:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-02 21:23 [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild systemd-218-r2.ebuild ChangeLog Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox