1 |
williamh 12/09/28 16:32:31 |
2 |
|
3 |
Modified: openrc-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Fix the ebuild so we can use pre/postinst on prefix systems as well. |
6 |
Originally I did not think we needed this, but thinking it over it is |
7 |
better to have them. Also this reworks the live portion of the ebuild to |
8 |
use a separate inherit call. |
9 |
|
10 |
(Portage version: 2.2.0_alpha134/cvs/Linux i686) |
11 |
|
12 |
Revision Changes Path |
13 |
1.104 sys-apps/openrc/openrc-9999.ebuild |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.104&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.104&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.103&r2=1.104 |
18 |
|
19 |
Index: openrc-9999.ebuild |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
22 |
retrieving revision 1.103 |
23 |
retrieving revision 1.104 |
24 |
diff -u -r1.103 -r1.104 |
25 |
--- openrc-9999.ebuild 27 Sep 2012 19:04:00 -0000 1.103 |
26 |
+++ openrc-9999.ebuild 28 Sep 2012 16:32:31 -0000 1.104 |
27 |
@@ -1,17 +1,18 @@ |
28 |
# Copyright 1999-2012 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.103 2012/09/27 19:04:00 williamh Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.104 2012/09/28 16:32:31 williamh Exp $ |
32 |
|
33 |
EAPI=4 |
34 |
|
35 |
-EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git" |
36 |
-[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2" |
37 |
-inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS} |
38 |
-unset SCM_ECLASS |
39 |
+inherit eutils flag-o-matic multilib pam toolchain-funcs |
40 |
|
41 |
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" |
42 |
HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" |
43 |
-if [[ ${PV} != "9999" ]] ; then |
44 |
+ |
45 |
+if [[ ${PV} == "9999" ]]; then |
46 |
+ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git" |
47 |
+ inherit git-2 |
48 |
+else |
49 |
SRC_URI="mirror://gentoo/${P}.tar.bz2" |
50 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
51 |
fi |
52 |
@@ -101,12 +102,12 @@ |
53 |
|
54 |
src_install() { |
55 |
make_args |
56 |
- emake ${MAKE_ARGS} DESTDIR="${D}" install |
57 |
+ emake ${MAKE_ARGS} DESTDIR="${ED}" install |
58 |
|
59 |
# move the shared libs back to /usr so ldscript can install |
60 |
# more of a minimal set of files |
61 |
# disabled for now due to #270646 |
62 |
- #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die |
63 |
+ #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die |
64 |
#gen_usr_ldscript -a einfo rc |
65 |
gen_usr_ldscript libeinfo.so |
66 |
gen_usr_ldscript librc.so |
67 |
@@ -132,7 +133,7 @@ |
68 |
|
69 |
# On HPPA, do not run consolefont by default (bug #222889) |
70 |
if use hppa; then |
71 |
- rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont |
72 |
+ rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont |
73 |
fi |
74 |
|
75 |
# Support for logfile rotation |
76 |
@@ -148,32 +149,30 @@ |
77 |
local runlevel=${2:-boot} |
78 |
# if the initscript is not going to be installed and is not |
79 |
# currently installed, return |
80 |
- [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ |
81 |
+ [[ -e ${ED}/etc/init.d/${initd} || -e ${EROOT}/etc/init.d/${initd} ]] \ |
82 |
|| return |
83 |
- [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return |
84 |
+ [[ -e ${EROOT}/etc/runlevels/${runlevel}/${initd} ]] && return |
85 |
|
86 |
# if runlevels dont exist just yet, then create it but still flag |
87 |
# to pkg_postinst that it needs real setup #277323 |
88 |
- if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then |
89 |
- mkdir -p "${ROOT}"/etc/runlevels/${runlevel} |
90 |
- touch "${ROOT}"/etc/runlevels/.add_boot_init.created |
91 |
+ if [[ ! -d ${EROOT}/etc/runlevels/${runlevel} ]] ; then |
92 |
+ mkdir -p "${EROOT}"/etc/runlevels/${runlevel} |
93 |
+ touch "${EROOT}"/etc/runlevels/.add_boot_init.created |
94 |
fi |
95 |
|
96 |
elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" |
97 |
- ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd} |
98 |
+ ln -snf /etc/init.d/${initd} "${EROOT}"/etc/runlevels/${runlevel}/${initd} |
99 |
} |
100 |
add_boot_init_mit_config() { |
101 |
local config=$1 initd=$2 |
102 |
- if [[ -e ${ROOT}${config} ]] ; then |
103 |
- if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then |
104 |
+ if [[ -e ${EROOT}${config} ]] ; then |
105 |
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"/${config}) ]] ; then |
106 |
add_boot_init ${initd} |
107 |
fi |
108 |
fi |
109 |
} |
110 |
|
111 |
pkg_preinst() { |
112 |
- use prefix && return 0 |
113 |
- |
114 |
local f LIBDIR=$(get_libdir) |
115 |
|
116 |
# default net script is just comments, so no point in biting people |
117 |
@@ -181,54 +180,55 @@ |
118 |
# manager doesnt go throwing etc-update crap at us -- postinst is |
119 |
# too late to prevent that. this behavior also lets us keep the |
120 |
# file in the CONTENTS for binary packages. |
121 |
- [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/ |
122 |
+ [[ -e ${EROOT}/etc/conf.d/net ]] && \ |
123 |
+ cp "${EROOT}"/etc/conf.d/net "${ED}"/etc/conf.d/ |
124 |
|
125 |
# avoid default thrashing in conf.d files when possible #295406 |
126 |
- if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then |
127 |
+ if [[ -e ${EROOT}/etc/conf.d/hostname ]] ; then |
128 |
( |
129 |
unset hostname HOSTNAME |
130 |
- source "${ROOT}"/etc/conf.d/hostname |
131 |
+ source "${EROOT}"/etc/conf.d/hostname |
132 |
: ${hostname:=${HOSTNAME}} |
133 |
[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" |
134 |
) |
135 |
fi |
136 |
|
137 |
# upgrade timezone file ... do it before moving clock |
138 |
- if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then |
139 |
+ if [[ -e ${EROOT}/etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then |
140 |
( |
141 |
unset TIMEZONE |
142 |
- source "${ROOT}"/etc/conf.d/clock |
143 |
- [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone |
144 |
+ source "${EROOT}"/etc/conf.d/clock |
145 |
+ [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"/etc/timezone |
146 |
) |
147 |
fi |
148 |
|
149 |
# /etc/conf.d/clock moved to /etc/conf.d/hwclock |
150 |
local clock |
151 |
use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" |
152 |
- if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then |
153 |
- mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} |
154 |
+ if [[ -e ${EROOT}/etc/conf.d/clock ]] ; then |
155 |
+ mv "${EROOT}"/etc/conf.d/clock "${EROOT}"/etc/conf.d/${clock} |
156 |
fi |
157 |
- if [[ -e ${ROOT}/etc/init.d/clock ]] ; then |
158 |
- rm -f "${ROOT}"/etc/init.d/clock |
159 |
+ if [[ -e ${EROOT}/etc/init.d/clock ]] ; then |
160 |
+ rm -f "${EROOT}"/etc/init.d/clock |
161 |
fi |
162 |
- if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then |
163 |
- rm -f "${ROOT}"/etc/runlevels/boot/clock |
164 |
- ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} |
165 |
- fi |
166 |
- if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then |
167 |
- rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock |
168 |
- ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} |
169 |
+ if [[ -L ${EROOT}/etc/runlevels/boot/clock ]] ; then |
170 |
+ rm -f "${EROOT}"/etc/runlevels/boot/clock |
171 |
+ ln -snf /etc/init.d/${clock} "${EROOT}"/etc/runlevels/boot/${clock} |
172 |
+ fi |
173 |
+ if [[ -L ${EROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then |
174 |
+ rm -f "${EROOT}${LIBDIR}"/rc/init.d/started/clock |
175 |
+ ln -snf /etc/init.d/${clock} "${EROOT}${LIBDIR}"/rc/init.d/started/${clock} |
176 |
fi |
177 |
|
178 |
# /etc/conf.d/rc is no longer used for configuration |
179 |
- if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then |
180 |
+ if [[ -e ${EROOT}/etc/conf.d/rc ]] ; then |
181 |
elog "/etc/conf.d/rc is no longer used for configuration." |
182 |
elog "Please migrate your settings to /etc/rc.conf as applicable" |
183 |
elog "and delete /etc/conf.d/rc" |
184 |
fi |
185 |
|
186 |
# force net init.d scripts into symlinks |
187 |
- for f in "${ROOT}"/etc/init.d/net.* ; do |
188 |
+ for f in "${EROOT}"/etc/init.d/net.* ; do |
189 |
[[ -e ${f} ]] || continue # catch net.* not matching anything |
190 |
[[ ${f} == */net.lo ]] && continue # real file now |
191 |
[[ ${f} == *.openrc.bak ]] && continue |
192 |
@@ -276,7 +276,7 @@ |
193 |
|
194 |
migrate_from_baselayout_1() { |
195 |
# baselayout boot init scripts have been split out |
196 |
- for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do |
197 |
+ for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do |
198 |
# baselayout-1 is always "old" net, so ignore "new" net |
199 |
[[ ${f} == "network" ]] && continue |
200 |
|
201 |
@@ -288,40 +288,40 @@ |
202 |
add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt |
203 |
add_boot_init_mit_config /etc/mdadm.conf mdraid |
204 |
add_boot_init_mit_config /etc/evms.conf evms |
205 |
- [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper |
206 |
- [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm |
207 |
+ [[ -e ${EROOT}/sbin/dmsetup ]] && add_boot_init device-mapper |
208 |
+ [[ -e ${EROOT}/sbin/vgscan ]] && add_boot_init lvm |
209 |
elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" |
210 |
elog "init.d scripts. If you use such a thing, make sure you have the" |
211 |
elog "required init.d scripts added to your boot runlevel." |
212 |
|
213 |
# Upgrade our state for baselayout-1 users |
214 |
- if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then |
215 |
+ if [[ ! -e ${EROOT}${LIBDIR}/rc/init.d/started ]] ; then |
216 |
( |
217 |
- [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc |
218 |
+ [[ -e ${EROOT}/etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc |
219 |
svcdir=${svcdir:-/var/lib/init.d} |
220 |
- if [[ ! -d ${ROOT}${svcdir}/started ]] ; then |
221 |
+ if [[ ! -d ${EROOT}${svcdir}/started ]] ; then |
222 |
ewarn "No state found, and no state exists" |
223 |
elog "You should reboot this host" |
224 |
else |
225 |
- mkdir -p "${ROOT}${LIBDIR}/rc/init.d" |
226 |
- einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" |
227 |
- mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d |
228 |
- rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ |
229 |
- "${ROOT}${LIBDIR}"/rc/init.d/console |
230 |
- umount "${ROOT}${svcdir}" 2>/dev/null |
231 |
- rm -rf "${ROOT}${svcdir}" |
232 |
+ mkdir -p "${EROOT}${LIBDIR}/rc/init.d" |
233 |
+ einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d" |
234 |
+ mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d |
235 |
+ rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \ |
236 |
+ "${EROOT}${LIBDIR}"/rc/init.d/console |
237 |
+ umount "${EROOT}${svcdir}" 2>/dev/null |
238 |
+ rm -rf "${EROOT}${svcdir}" |
239 |
fi |
240 |
) |
241 |
fi |
242 |
|
243 |
# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition |
244 |
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then |
245 |
+ if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then |
246 |
elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" |
247 |
- rm -f "${ROOT}"/etc/modules.autoload.d/.keep* |
248 |
- rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null |
249 |
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then |
250 |
+ rm -f "${EROOT}"/etc/modules.autoload.d/.keep* |
251 |
+ rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null |
252 |
+ if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then |
253 |
local f v |
254 |
- for f in "${ROOT}"/etc/modules.autoload.d/* ; do |
255 |
+ for f in "${EROOT}"/etc/modules.autoload.d/* ; do |
256 |
v=${f##*/} |
257 |
v=${v#kernel-} |
258 |
v=${v//[^[:alnum:]]/_} |
259 |
@@ -342,43 +342,41 @@ |
260 |
print |
261 |
} |
262 |
END { print "\n### END: Auto-converted from " f "\n" } |
263 |
- ' "${f}" >> "${D}"/etc/conf.d/modules |
264 |
+ ' "${f}" >> "${ED}"/etc/conf.d/modules |
265 |
done |
266 |
rm -f "${f}" |
267 |
- rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null |
268 |
+ rmdir "${EROOT}"/etc/modules.autoload.d 2>/dev/null |
269 |
fi |
270 |
fi |
271 |
} |
272 |
|
273 |
pkg_postinst() { |
274 |
- use prefix && return 0 |
275 |
- |
276 |
local LIBDIR=$(get_libdir) |
277 |
|
278 |
# Remove old baselayout links |
279 |
- rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} |
280 |
- rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh |
281 |
+ rm -f "${EROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} |
282 |
+ rm -f "${EROOT}"/etc/init.d/{depscan,runscript}.sh |
283 |
|
284 |
# Make our runlevels if they don't exist |
285 |
- if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then |
286 |
+ if [[ ! -e ${EROOT}/etc/runlevels ]] || [[ -e ${EROOT}/etc/runlevels/.add_boot_init.created ]] ; then |
287 |
einfo "Copying across default runlevels" |
288 |
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc |
289 |
- rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created |
290 |
+ cp -RPp "${EROOT}"/usr/share/${PN}/runlevels "${EROOT}"/etc |
291 |
+ rm -f "${EROOT}"/etc/runlevels/.add_boot_init.created |
292 |
else |
293 |
- if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then |
294 |
- mkdir -p "${ROOT}"/etc/runlevels/sysinit |
295 |
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ |
296 |
- "${ROOT}"/etc/runlevels/sysinit |
297 |
+ if [[ ! -e ${EROOT}/etc/runlevels/sysinit/devfs ]] ; then |
298 |
+ mkdir -p "${EROOT}"/etc/runlevels/sysinit |
299 |
+ cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/sysinit/* \ |
300 |
+ "${EROOT}"/etc/runlevels/sysinit |
301 |
fi |
302 |
- if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then |
303 |
- mkdir -p "${ROOT}"/etc/runlevels/shutdown |
304 |
- cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ |
305 |
- "${ROOT}"/etc/runlevels/shutdown |
306 |
+ if [[ ! -e ${EROOT}/etc/runlevels/shutdown/mount-ro ]] ; then |
307 |
+ mkdir -p "${EROOT}"/etc/runlevels/shutdown |
308 |
+ cp -RPp "${EROOT}"/usr/share/${PN}/runlevels/shutdown/* \ |
309 |
+ "${EROOT}"/etc/runlevels/shutdown |
310 |
fi |
311 |
fi |
312 |
|
313 |
# /etc/conf.d/net.example is no longer valid |
314 |
- local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example" |
315 |
+ local NET_EXAMPLE="${EROOT}/etc/conf.d/net.example" |
316 |
local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' |
317 |
if [[ -e "${NET_EXAMPLE}" ]] ; then |
318 |
if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then |
319 |
@@ -388,11 +386,11 @@ |
320 |
sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" |
321 |
elog "${NET_EXAMPLE} should be removed." |
322 |
fi |
323 |
- elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example" |
324 |
+ elog "The new file is ${EROOT}/usr/share/doc/${PF}/net.example" |
325 |
fi |
326 |
|
327 |
# /etc/conf.d/wireless.example is no longer valid |
328 |
- local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example" |
329 |
+ local WIRELESS_EXAMPLE="${EROOT}/etc/conf.d/wireless.example" |
330 |
local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' |
331 |
if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then |
332 |
if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then |
333 |
@@ -403,11 +401,11 @@ |
334 |
elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." |
335 |
fi |
336 |
elog "If you are using the old style network scripts," |
337 |
- elog "Configure wireless settings in ${ROOT}/etc/conf.d/net" |
338 |
- elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example" |
339 |
+ elog "Configure wireless settings in ${EROOT}/etc/conf.d/net" |
340 |
+ elog "after reviewing ${EROOT}/usr/share/doc/${PF}/net.example" |
341 |
fi |
342 |
|
343 |
- if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then |
344 |
+ if [[ -d ${EROOT}/etc/modules.autoload.d ]] ; then |
345 |
ewarn "/etc/modules.autoload.d is no longer used. Please convert" |
346 |
ewarn "your files to /etc/conf.d/modules and delete the directory." |
347 |
fi |
348 |
@@ -419,15 +417,15 @@ |
349 |
fi |
350 |
|
351 |
# Handle the conf.d/local.{start,stop} -> local.d transition |
352 |
- if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then |
353 |
- elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" |
354 |
- elog "files to ${ROOT}etc/local.d" |
355 |
- mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start |
356 |
- mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop |
357 |
- chmod +x "${ROOT}"etc/local.d/*{start,stop} |
358 |
+ if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then |
359 |
+ elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" |
360 |
+ elog "files to ${EROOT}etc/local.d" |
361 |
+ mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start |
362 |
+ mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop |
363 |
+ chmod +x "${EROOT}"etc/local.d/*{start,stop} |
364 |
fi |
365 |
|
366 |
- if use kernel_linux && [[ "${ROOT}" = "/" ]]; then |
367 |
+ if use kernel_linux && [[ "${EROOT}" = "/" ]]; then |
368 |
if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then |
369 |
ewarn "The dependency data could not be migrated to /run/openrc." |
370 |
ewarn "This means you need to reboot your system." |
371 |
@@ -435,7 +433,7 @@ |
372 |
fi |
373 |
|
374 |
# update the dependency tree after touching all files #224171 |
375 |
- [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u |
376 |
+ [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u |
377 |
|
378 |
elog "You should now update all files in /etc, using etc-update" |
379 |
elog "or equivalent before restarting any services or this host." |
380 |
|
381 |
|
382 |
|
383 |
1.228 sys-apps/openrc/ChangeLog |
384 |
|
385 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.228&view=markup |
386 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.228&content-type=text/plain |
387 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.227&r2=1.228 |
388 |
|
389 |
Index: ChangeLog |
390 |
=================================================================== |
391 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
392 |
retrieving revision 1.227 |
393 |
retrieving revision 1.228 |
394 |
diff -u -r1.227 -r1.228 |
395 |
--- ChangeLog 27 Sep 2012 19:04:00 -0000 1.227 |
396 |
+++ ChangeLog 28 Sep 2012 16:32:31 -0000 1.228 |
397 |
@@ -1,6 +1,12 @@ |
398 |
# ChangeLog for sys-apps/openrc |
399 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
400 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.227 2012/09/27 19:04:00 williamh Exp $ |
401 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.228 2012/09/28 16:32:31 williamh Exp $ |
402 |
+ |
403 |
+ 28 Sep 2012; William Hubbs <williamh@g.o> openrc-9999.ebuild: |
404 |
+ Fix the ebuild so we can use pre/postinst on prefix systems as well. |
405 |
+ Originally I did not think we needed this, but thinking it over it is better |
406 |
+ to have them. Also this reworks the live portion of the ebuild to use a |
407 |
+ separate inherit call. |
408 |
|
409 |
27 Sep 2012; William Hubbs <williamh@g.o> openrc-9999.ebuild: |
410 |
Add prefix support for bug #415899. I would like to thank Benda Xu for working |