Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-9999.ebuild systemd-218-r2.ebuild ChangeLog
Date: Mon, 02 Feb 2015 21:23:16
Message-Id: 20150202212309.5D2C610EB7@oystercatcher.gentoo.org
1 floppym 15/02/02 21:23:09
2
3 Modified: systemd-9999.ebuild systemd-218-r2.ebuild ChangeLog
4 Log:
5 Die if we fail to remove links in /etc.
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
8
9 Revision Changes Path
10 1.156 sys-apps/systemd/systemd-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.156&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?rev=1.156&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?r1=1.155&r2=1.156
15
16 Index: systemd-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v
19 retrieving revision 1.155
20 retrieving revision 1.156
21 diff -u -r1.155 -r1.156
22 --- systemd-9999.ebuild 2 Feb 2015 21:14:51 -0000 1.155
23 +++ systemd-9999.ebuild 2 Feb 2015 21:23:09 -0000 1.156
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2015 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.155 2015/02/02 21:14:51 floppym Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.156 2015/02/02 21:23:09 floppym Exp $
29
30 EAPI=5
31
32 @@ -377,10 +377,10 @@
33
34 # If we install these symlinks, there is no way for the sysadmin to remove them
35 # permanently.
36 - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
37 - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
38 - rm -f "${D}"/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
39 - rm -rf "${D}"/etc/systemd/system/network-online.target.wants
40 + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
41 + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
42 + rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
43 + rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
44 }
45
46 migrate_locale() {
47
48
49
50 1.3 sys-apps/systemd/systemd-218-r2.ebuild
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild?rev=1.3&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild?rev=1.3&content-type=text/plain
54 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild?r1=1.2&r2=1.3
55
56 Index: systemd-218-r2.ebuild
57 ===================================================================
58 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild,v
59 retrieving revision 1.2
60 retrieving revision 1.3
61 diff -u -r1.2 -r1.3
62 --- systemd-218-r2.ebuild 2 Feb 2015 21:14:51 -0000 1.2
63 +++ systemd-218-r2.ebuild 2 Feb 2015 21:23:09 -0000 1.3
64 @@ -1,6 +1,6 @@
65 # Copyright 1999-2015 Gentoo Foundation
66 # Distributed under the terms of the GNU General Public License v2
67 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild,v 1.2 2015/02/02 21:14:51 floppym Exp $
68 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-218-r2.ebuild,v 1.3 2015/02/02 21:23:09 floppym Exp $
69
70 EAPI=5
71
72 @@ -354,10 +354,10 @@
73
74 # If we install these symlinks, there is no way for the sysadmin to remove them
75 # permanently.
76 - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
77 - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
78 - rm -f "${D}"/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
79 - rm -rf "${D}"/etc/systemd/system/network-online.target.wants
80 + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
81 + rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
82 + rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
83 + rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
84 }
85
86 migrate_locale() {
87
88
89
90 1.345 sys-apps/systemd/ChangeLog
91
92 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.345&view=markup
93 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.345&content-type=text/plain
94 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.344&r2=1.345
95
96 Index: ChangeLog
97 ===================================================================
98 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
99 retrieving revision 1.344
100 retrieving revision 1.345
101 diff -u -r1.344 -r1.345
102 --- ChangeLog 2 Feb 2015 21:14:51 -0000 1.344
103 +++ ChangeLog 2 Feb 2015 21:23:09 -0000 1.345
104 @@ -1,6 +1,10 @@
105 # ChangeLog for sys-apps/systemd
106 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
107 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.344 2015/02/02 21:14:51 floppym Exp $
108 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.345 2015/02/02 21:23:09 floppym Exp $
109 +
110 + 02 Feb 2015; Mike Gilbert <floppym@g.o> systemd-218-r2.ebuild,
111 + systemd-9999.ebuild:
112 + Die if we fail to remove links in /etc.
113
114 02 Feb 2015; Mike Gilbert <floppym@g.o> systemd-218-r2.ebuild,
115 systemd-9999.ebuild:
Report Message
Find on MARC Find on Google Groups