Make sure ${ROOT}/etc/runlevels exists early enough #277323 by Ed Wildgoose.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 43 insertions, 10 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 77d21c302938..ede0b2c5f388 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.75 2009/07/11 15:12:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.76 2009/08/23 09:19:10 vapier Exp $
+
+  23 Aug 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.4.3-r3.ebuild,
+  openrc-9999.ebuild:
+  Make sure ${ROOT}/etc/runlevels exists early enough #277323 by Ed
+  Wildgoose.
 
   11 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
   +files/0.4.3/0003-command-line-size-fix.patch, openrc-0.4.3-r3.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 1f8666a8872f..3a89390104b4 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.4.0/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b
 AUX 0.4.0/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475
 AUX 0.4.0/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539
@@ -20,7 +23,14 @@ EBUILD openrc-0.4.1-r1.ebuild 10257 RMD160 09b1f0ef469dadb4db344e87f5695cbf40a48
 EBUILD openrc-0.4.2.ebuild 10228 RMD160 769c35cd085c3b45d722321c1d13d35b8c4c7283 SHA1 111aa2392d965846dc9ddf1c535010eec1524ed0 SHA256 b17d081ec30ae557bf5d2664b25e51f1b0425f08d4d8eba932c5a33672555681
 EBUILD openrc-0.4.3-r1.ebuild 10401 RMD160 441494782af660a954102d347411d0905d9f2520 SHA1 7826444c7fafd4a20f0feca79449e1fc5dc7f8ed SHA256 8bb06d5f79a3010b2060a75ef7770cd95baf71c6be9c59cda7e7288531c5fa06
 EBUILD openrc-0.4.3-r2.ebuild 10556 RMD160 2335ae861e4dc0c24c7a4948cc468545b93e8591 SHA1 56eb224e8b1c87f29ec19ef71554497191314308 SHA256 034a3b67c861b1b75f2cff8b58f7e220ae3f30158962bf0d1cae1cca64f263b2
-EBUILD openrc-0.4.3-r3.ebuild 10712 RMD160 db8596789995c964d2936fb36012e5a7c0406b2f SHA1 7b1e8775a1f581ccd922af5503ab291fb0839ec4 SHA256 cc2fa654698e549c6fad77049d2e9fdca089647a1f19f2c4a54922a9655bf309
-EBUILD openrc-9999.ebuild 10387 RMD160 eff6df130dcf021a8beee295345f26cd1f3c81a0 SHA1 1eca942502123fa6e47cf5d8eb3a3211823505a2 SHA256 04df595f59d75be627fa77fec97fb72cc15f1f939973752786c4b9792ecadbb0
-MISC ChangeLog 15415 RMD160 9ab3915a8a1e82ff5e2182db55c0c80090e48962 SHA1 25cfc7daa5975e03f9ee3dd2ef763bd57b96efa3 SHA256 b5aedbb95eaf4555c5f02075725b6767f0f0640717d90df35dbb15a256ff019a
+EBUILD openrc-0.4.3-r3.ebuild 11091 RMD160 17312849980c51bd48814dca356356f828db5e46 SHA1 edd7bb544ca510e9494e29b4dd9376c6bf0e7c28 SHA256 19828a957f6436924faddc91a3bac76555d01f2a047cd07c19bdfd6cac6eca8e
+EBUILD openrc-9999.ebuild 10769 RMD160 4097308aaa038422fa7b7e2c7729b85864e19e85 SHA1 a530f8344b02aecd004b4b55d9f1f5c5b4c6aa8e SHA256 1fb4444af88d7701a5014a6b106738ba67e7ac997bd14e8ec97f253ec5c27e62
+MISC ChangeLog 15592 RMD160 dfea054c535ed5445f3cf2e655823113f5b205e7 SHA1 fd097bb43854b51eae88c92be3b1304546d2423a SHA256 22d1346149eb6e7d47460f47baada5e604e383c11fda0271863fded0e26ace14
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqRCaAACgkQlPl3HsVfCDpVXACfWBdfK3SlcgWc6TalkxWHtELs
+lJQAn1Hfs9kaSPkhe4B9Tjx2upER6iT4
+=njaE
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.4.3-r3.ebuild b/sys-apps/openrc/openrc-0.4.3-r3.ebuild
index bb476bb3da1b..c562ec3f9aaa 100644
--- a/sys-apps/openrc/openrc-0.4.3-r3.ebuild
+++ b/sys-apps/openrc/openrc-0.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild,v 1.3 2009/07/11 15:12:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild,v 1.4 2009/08/23 09:19:10 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -111,11 +111,19 @@ src_install() {
 
 add_boot_init() {
 	local initd=$1
-	# if the initscript is not going to be installed and  is not
+	# if the initscript is not going to be installed and is not
 	# currently installed, return
 	[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
 		|| return
 	[[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d ${ROOT}/etc/runlevels/boot ]] ; then
+		mkdir -p "${ROOT}"/etc/runlevels/boot
+		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
+	fi
+
 	elog "Auto-adding '${initd}' service to your boot runlevel"
 	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
 }
@@ -288,9 +296,10 @@ pkg_postinst() {
 	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
 
 	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
+	if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
 		einfo "Copying across default runlevels"
 		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
+		rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
 	else
 		if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
 			mkdir -p "${ROOT}"/etc/runlevels/sysinit
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 4ad8fb4b7599..633f95cc20a8 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.50 2009/06/15 11:11:23 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.51 2009/08/23 09:19:10 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -107,11 +107,19 @@ src_install() {
 
 add_boot_init() {
 	local initd=$1
-	# if the initscript is not going to be installed and  is not
+	# if the initscript is not going to be installed and is not
 	# currently installed, return
 	[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
 		|| return
 	[[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d ${ROOT}/etc/runlevels/boot ]] ; then
+		mkdir -p "${ROOT}"/etc/runlevels/boot
+		touch "${ROOT}"/etc/runlevels/.add_boot_init.created
+	fi
+
 	elog "Auto-adding '${initd}' service to your boot runlevel"
 	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
 }
@@ -284,9 +292,10 @@ pkg_postinst() {
 	[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net
 
 	# Make our runlevels if they don't exist
-	if [[ ! -e ${ROOT}/etc/runlevels ]] ; then
+	if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
 		einfo "Copying across default runlevels"
 		cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
+		rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
 	else
 		if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
 			mkdir -p "${ROOT}"/etc/runlevels/sysinit