Fix local.start and local.stop migration for bug #351465.

(Portage version: 2.2.0_alpha19/cvs/Linux i686)

2 files changed, 21 insertions, 21 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 34564500b98d..d62ab3e9ee28 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.128 2011/01/13 02:42:09 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.129 2011/01/23 01:20:19 williamh Exp $
+
+  23 Jan 2011; William Hubbs <williamh@gentoo.org> openrc-9999.ebuild:
+  Fix the /etc/conf.d/local.{start,stop} migration from baselayout-1 to
+  migrate these files to /etc/local.d/baselayout1.start and
+  /etc/local.d/baselayout1.stop.
+  This is for bug #351465.
 
 *openrc-0.7.0 (13 Jan 2011)
 
@@ -123,7 +129,7 @@
   21 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
   openrc-9999.ebuild, +files/openrc-9999-pause.patch:
   Restore "pause" functionality to teach people to convert #218859 by Martin
-  Mokrejš.
+  Mokrejš.
 
   21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
   files/openrc-9999-msg-style.patch:
@@ -132,7 +138,7 @@
   07 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
   openrc-9999.ebuild:
   Migrate hostname by default to avoid default thrashing on conf.d/hostname
-  #295406 by Martin Mokrejš. Also delay automatic dep tree update till
+  #295406 by Martin Mokrejš. Also delay automatic dep tree update till
   after we are done screwing with /etc.
 
   06 Dec 2009; William Hubbs <williamh@gentoo.org> -openrc-0.5.2-r2.ebuild,
@@ -246,7 +252,7 @@
 
   15 Oct 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.1-r1.ebuild,
   openrc-9999.ebuild:
-  Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
+  Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
 
 *openrc-0.5.1-r1 (15 Oct 2009)
 
@@ -312,14 +318,14 @@
   files/9999/0003-KV.patch:
   Update patches against latest svn #267540 by Vivien Moreau.
 
-  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
   files/0.4.3/0002-support-custom-status.patch:
   backport r1523 and r1524 to fix compile on FreeBSD and still provide the
   system status function in custom hooks
 
 *openrc-0.4.3-r2 (18 Apr 2009)
 
-  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+  18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
   +files/0.4.3/0002-support-custom-status.patch,
   -files/openrc-0.4.3-fix-is_older_than.patch,
   +files/0.4.3/0001-fix-is_older_than.patch, openrc-0.4.3-r1.ebuild,
@@ -375,7 +381,7 @@
   03 Jan 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Change comment into useable tags.
 
-  01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+  01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
   +files/0.4.0/0005-init-script-novserver.patch:
   fix dmesg and sysfs init script inside vservers, bug #253105
 
@@ -569,7 +575,7 @@
   +openrc-0.2.1-r1.ebuild:
   fix bug #216091. crash when stringlist was non-existant
 
-  03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
+  03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
   Add ~sparc wrt #214957
 
   02 Apr 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2.1.ebuild,
@@ -630,7 +636,7 @@
   28 Mar 2008; Alexis Ballier <aballier@gentoo.org> openrc-0.2-r1.ebuild:
   keyword ~x86-fbsd
 
-  28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
+  28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
   Add ~ia64 wrt #214957
 
   27 Mar 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2-r1.ebuild:
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 6f1d83fadd3e..1f3a29866bfb 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.74 2011/01/06 23:53:46 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.75 2011/01/23 01:20:19 williamh Exp $
 
 EAPI="1"
 
@@ -337,18 +337,12 @@ migrate_from_baselayout_1() {
 		fi
 	fi
 
-	# Handle the conf.d/local.{start,stop} -> conf.d/local transition
+	# Handle the conf.d/local.{start,stop} -> local.d transition
 	if path_exists -o "${ROOT}"/etc/conf.d/local.{start,stop} ; then
-		elog "Converting your /etc/conf.d/local.{start,stop} files to /etc/conf.d/local"
-		(
-		sed -n '0,/local_start/p' "${D}"/etc/conf.d/local
-		sed 's:^:\t:' "${ROOT}"/etc/conf.d/local.start 2>/dev/null
-		sed -n '/local_start/,/local_stop/{s:^local_start.*::;p}' "${D}"/etc/conf.d/local
-		sed 's:^:\t:' "${ROOT}"/etc/conf.d/local.stop 2>/dev/null
-		sed -n '/local_stop/,${s:^local_stop.*::;p}' "${D}"/etc/conf.d/local
-		) > "${T}"/conf.d.local
-		mv "${T}"/conf.d.local "${D}"/etc/conf.d/local
-		touch "${D}"/etc/conf.d/local.{start,stop}
+		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}
 	fi
 }