diff options
| author |   William Hubbs <williamh@gentoo.org> | 2011-04-17 21:02:51 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2011-04-17 21:02:51 +0000 |
| commit | cf351fb3458f05befb9d1505ad0946ccda6df1b0 (patch) | |
| tree | 6d03bb8464a72772f4effd53941f79d4b2bfd094 /sys-apps | |
| parent | version bump (diff) | |
| download | gentoo-2-cf351fb3458f05befb9d1505ad0946ccda6df1b0.tar.gz gentoo-2-cf351fb3458f05befb9d1505ad0946ccda6df1b0.tar.bz2 gentoo-2-cf351fb3458f05befb9d1505ad0946ccda6df1b0.zip | |
Fix the migration of /etc/conf.d/local.* for bug #363949.
(Portage version: 2.2.0_alpha30/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/openrc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-9999.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index 225b231015c8..9dd19ad55576 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.143 2011/04/16 13:44:48 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.144 2011/04/17 21:02:51 williamh Exp $ + + 17 Apr 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild: + fix the migration of /etc/conf.d/local.* for bug #363949. 16 Apr 2011; William Hubbs <williamh@gentoo.org> -openrc-0.8.1.ebuild: remove broken version diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index f4dd82d23d1a..2bf78f278cbb 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.81 2011/04/15 03:43:47 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.82 2011/04/17 21:02:51 williamh Exp $ EAPI="1" @@ -343,15 +343,6 @@ migrate_from_baselayout_1() { rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null fi fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" - elog "files to ${ROOT}etc/local.d" - mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start - mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop - chmod +x "${ROOT}"etc/local.d/*{start,stop} - fi } pkg_postinst() { @@ -420,6 +411,15 @@ pkg_postinst() { elog "# rc-update add consolefont boot" fi + # Handle the conf.d/local.{start,stop} -> local.d transition + if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then + elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" + elog "files to ${ROOT}etc/local.d" + mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start + mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop + chmod +x "${ROOT}"etc/local.d/*{start,stop} + fi + # update the dependency tree after touching all files #224171 [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u |