summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/openrc/ChangeLog5
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild13
2 files changed, 11 insertions, 7 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 4ebbcf217398..ac08a957dfb7 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.139 2011/04/15 03:27:29 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.140 2011/04/15 03:43:47 williamh Exp $
+
+ 15 Apr 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+ Fix conf.d/local -> local.d transition for bug #363637.
15 Apr 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
Disable consolefont on hppa by default for bug #222889, thanks to
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 77599d6bf1a3..f4dd82d23d1a 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.80 2011/04/15 03:27:29 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.81 2011/04/15 03:43:47 williamh Exp $
EAPI="1"
@@ -345,11 +345,12 @@ migrate_from_baselayout_1() {
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 /etc/conf.d/local.{start,stop} files to /etc/local.d"
- mv "${ROOT}"/etc/conf.d/local.start "${ROOT}"/local.d/baselayout1.start
- mv "${ROOT}"/etc/conf.d/local.stop "${ROOT}"/local.d/baselayout1.stop
- chmod +x "${ROOT}"/local.d/*{start,stop}
+ 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
}