1 |
williamh 11/01/23 01:20:20 |
2 |
|
3 |
Modified: ChangeLog openrc-9999.ebuild |
4 |
Log: |
5 |
Fix local.start and local.stop migration for bug #351465. |
6 |
|
7 |
(Portage version: 2.2.0_alpha19/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.129 sys-apps/openrc/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.129&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.129&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.128&r2=1.129 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
19 |
retrieving revision 1.128 |
20 |
retrieving revision 1.129 |
21 |
diff -u -r1.128 -r1.129 |
22 |
--- ChangeLog 13 Jan 2011 02:42:09 -0000 1.128 |
23 |
+++ ChangeLog 23 Jan 2011 01:20:19 -0000 1.129 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for sys-apps/openrc |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.128 2011/01/13 02:42:09 williamh Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.129 2011/01/23 01:20:19 williamh Exp $ |
29 |
+ |
30 |
+ 23 Jan 2011; William Hubbs <williamh@g.o> openrc-9999.ebuild: |
31 |
+ Fix the /etc/conf.d/local.{start,stop} migration from baselayout-1 to |
32 |
+ migrate these files to /etc/local.d/baselayout1.start and |
33 |
+ /etc/local.d/baselayout1.stop. |
34 |
+ This is for bug #351465. |
35 |
|
36 |
*openrc-0.7.0 (13 Jan 2011) |
37 |
|
38 |
@@ -123,7 +129,7 @@ |
39 |
21 Dec 2009; Mike Frysinger <vapier@g.o> openrc-0.5.3.ebuild, |
40 |
openrc-9999.ebuild, +files/openrc-9999-pause.patch: |
41 |
Restore "pause" functionality to teach people to convert #218859 by Martin |
42 |
- Mokrejš. |
43 |
+ Mokrejš. |
44 |
|
45 |
21 Dec 2009; Mike Frysinger <vapier@g.o> |
46 |
files/openrc-9999-msg-style.patch: |
47 |
@@ -132,7 +138,7 @@ |
48 |
07 Dec 2009; Mike Frysinger <vapier@g.o> openrc-0.5.3.ebuild, |
49 |
openrc-9999.ebuild: |
50 |
Migrate hostname by default to avoid default thrashing on conf.d/hostname |
51 |
- #295406 by Martin Mokrejš. Also delay automatic dep tree update till |
52 |
+ #295406 by Martin Mokrejš. Also delay automatic dep tree update till |
53 |
after we are done screwing with /etc. |
54 |
|
55 |
06 Dec 2009; William Hubbs <williamh@g.o> -openrc-0.5.2-r2.ebuild, |
56 |
@@ -246,7 +252,7 @@ |
57 |
|
58 |
15 Oct 2009; Mike Frysinger <vapier@g.o> openrc-0.5.1-r1.ebuild, |
59 |
openrc-9999.ebuild: |
60 |
- Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò. |
61 |
+ Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò. |
62 |
|
63 |
*openrc-0.5.1-r1 (15 Oct 2009) |
64 |
|
65 |
@@ -312,14 +318,14 @@ |
66 |
files/9999/0003-KV.patch: |
67 |
Update patches against latest svn #267540 by Vivien Moreau. |
68 |
|
69 |
- 18 Apr 2009; Benedikt Böhm <hollow@g.o> |
70 |
+ 18 Apr 2009; Benedikt Böhm <hollow@g.o> |
71 |
files/0.4.3/0002-support-custom-status.patch: |
72 |
backport r1523 and r1524 to fix compile on FreeBSD and still provide the |
73 |
system status function in custom hooks |
74 |
|
75 |
*openrc-0.4.3-r2 (18 Apr 2009) |
76 |
|
77 |
- 18 Apr 2009; Benedikt Böhm <hollow@g.o> |
78 |
+ 18 Apr 2009; Benedikt Böhm <hollow@g.o> |
79 |
+files/0.4.3/0002-support-custom-status.patch, |
80 |
-files/openrc-0.4.3-fix-is_older_than.patch, |
81 |
+files/0.4.3/0001-fix-is_older_than.patch, openrc-0.4.3-r1.ebuild, |
82 |
@@ -375,7 +381,7 @@ |
83 |
03 Jan 2009; Jeroen Roovers <jer@g.o> metadata.xml: |
84 |
Change comment into useable tags. |
85 |
|
86 |
- 01 Jan 2009; Benedikt Böhm <hollow@g.o> |
87 |
+ 01 Jan 2009; Benedikt Böhm <hollow@g.o> |
88 |
+files/0.4.0/0005-init-script-novserver.patch: |
89 |
fix dmesg and sysfs init script inside vservers, bug #253105 |
90 |
|
91 |
@@ -569,7 +575,7 @@ |
92 |
+openrc-0.2.1-r1.ebuild: |
93 |
fix bug #216091. crash when stringlist was non-existant |
94 |
|
95 |
- 03 Apr 2008; Raúl Porcel <armin76@g.o> openrc-0.2.1.ebuild: |
96 |
+ 03 Apr 2008; Raúl Porcel <armin76@g.o> openrc-0.2.1.ebuild: |
97 |
Add ~sparc wrt #214957 |
98 |
|
99 |
02 Apr 2008; Doug Goldstein <cardoe@g.o> openrc-0.2.1.ebuild, |
100 |
@@ -630,7 +636,7 @@ |
101 |
28 Mar 2008; Alexis Ballier <aballier@g.o> openrc-0.2-r1.ebuild: |
102 |
keyword ~x86-fbsd |
103 |
|
104 |
- 28 Mar 2008; Raúl Porcel <armin76@g.o> openrc-0.2-r1.ebuild: |
105 |
+ 28 Mar 2008; Raúl Porcel <armin76@g.o> openrc-0.2-r1.ebuild: |
106 |
Add ~ia64 wrt #214957 |
107 |
|
108 |
27 Mar 2008; Doug Goldstein <cardoe@g.o> openrc-0.2-r1.ebuild: |
109 |
|
110 |
|
111 |
|
112 |
1.75 sys-apps/openrc/openrc-9999.ebuild |
113 |
|
114 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.75&view=markup |
115 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.75&content-type=text/plain |
116 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.74&r2=1.75 |
117 |
|
118 |
Index: openrc-9999.ebuild |
119 |
=================================================================== |
120 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
121 |
retrieving revision 1.74 |
122 |
retrieving revision 1.75 |
123 |
diff -u -r1.74 -r1.75 |
124 |
--- openrc-9999.ebuild 6 Jan 2011 23:53:46 -0000 1.74 |
125 |
+++ openrc-9999.ebuild 23 Jan 2011 01:20:19 -0000 1.75 |
126 |
@@ -1,6 +1,6 @@ |
127 |
# Copyright 1999-2011 Gentoo Foundation |
128 |
# Distributed under the terms of the GNU General Public License v2 |
129 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.74 2011/01/06 23:53:46 williamh Exp $ |
130 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.75 2011/01/23 01:20:19 williamh Exp $ |
131 |
|
132 |
EAPI="1" |
133 |
|
134 |
@@ -337,18 +337,12 @@ |
135 |
fi |
136 |
fi |
137 |
|
138 |
- # Handle the conf.d/local.{start,stop} -> conf.d/local transition |
139 |
+ # Handle the conf.d/local.{start,stop} -> local.d transition |
140 |
if path_exists -o "${ROOT}"/etc/conf.d/local.{start,stop} ; then |
141 |
- elog "Converting your /etc/conf.d/local.{start,stop} files to /etc/conf.d/local" |
142 |
- ( |
143 |
- sed -n '0,/local_start/p' "${D}"/etc/conf.d/local |
144 |
- sed 's:^:\t:' "${ROOT}"/etc/conf.d/local.start 2>/dev/null |
145 |
- sed -n '/local_start/,/local_stop/{s:^local_start.*::;p}' "${D}"/etc/conf.d/local |
146 |
- sed 's:^:\t:' "${ROOT}"/etc/conf.d/local.stop 2>/dev/null |
147 |
- sed -n '/local_stop/,${s:^local_stop.*::;p}' "${D}"/etc/conf.d/local |
148 |
- ) > "${T}"/conf.d.local |
149 |
- mv "${T}"/conf.d.local "${D}"/etc/conf.d/local |
150 |
- touch "${D}"/etc/conf.d/local.{start,stop} |
151 |
+ elog "Moving your /etc/conf.d/local.{start,stop} files to /etc/local.d" |
152 |
+ mv "${ROOT}"/etc/conf.d/local.start "${ROOT}"/local.d/baselayout1.start |
153 |
+ mv "${ROOT}"/etc/conf.d/local.stop "${ROOT}"/local.d/baselayout1.stop |
154 |
+ chmod +x "${ROOT}"/local.d/*{start,stop} |
155 |
fi |
156 |
} |