Autoadd dmcrypt/mdraid/lvm init.d scripts when possible #215374.

Package-Manager: portage-2.2_pre5

4 files changed, 70 insertions, 12 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index d4ced5656610..234b1b173432 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.15 2008/03/29 17:50:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.16 2008/03/30 16:06:45 vapier Exp $
+
+  30 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r2.ebuild,
+  openrc-9999.ebuild:
+  Autoadd dmcrypt/mdraid/lvm init.d scripts when possible #215374.
 
   29 Mar 2008; Jeroen Roovers <jer@gentoo.org> openrc-0.2-r2.ebuild:
   Marked ~hppa (bug #214957).
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index f772f433f2eb..e15bd4341f7c 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openrc-0.2-freebsd-install-rc.patch 888 RMD160 5f3c421d389bf1d5ca8113ee7566b2fa9f3dd89d SHA1 e4f0ab407b88f28e3ce696e63ee0450338c3ca1a SHA256 a14eadfc0cb2da40d53783f73b4d8474827baaf7a38f21fd5c1050d295cff14e
 AUX openrc-0.2-multilib-fix.patch 2932 RMD160 13d72da315afdd2e8e26ea89e51f4dd54fe47f7f SHA1 da18061560ebd38b8d712cfc4c2390fd2f88dc45 SHA256 1d7e7cd190240d0359c305f387d06503f54087a6dc30d62c245809f03238320d
 AUX openrc-0.2-multiple-ntp-servers.patch 836 RMD160 166f26228c8f76dab12e7f0f69dd81c31b4dd510 SHA1 00832b699d08b2548078f03d2aeafeabe9dee636 SHA256 b758817e770321b201a75e0005839a2221c5c20c15df66b76c7e2a06eb532b74
 AUX openrc-0.2-sysctl-vserver-fix.patch 600 RMD160 bf7cf450d96247eba9e4deb2e8dca14b761cdb56 SHA1 8f413560cdcac5e300a958a805cf4aff58bdaae1 SHA256 7db22dcb9a1e3aca9b08d743df40939e46c456a5c249aa1bacbb6924e216fce6
 DIST openrc-0.2.tar.bz2 141615 RMD160 282122e6b152e3b86483eb2b3e90565adb11f08f SHA1 b41a9981b6d0e3963e278c37b292d3f4877bb8fc SHA256 5f8f718ef0c1e3188b7b19fc868fdf5719fc5a1a65d4376f2becd3b78ccc2ef1
-EBUILD openrc-0.2-r2.ebuild 7475 RMD160 1c0428b81876f392f0f417b479cfa9f94e06ff50 SHA1 74e51c145a79c9f4bdd1883a9f3f4a8ba8e3c0b8 SHA256 63bc8e498c3b1ad777b8b4f8b9d0d23f951e1a2f25d7547871c1d7483b05a620
-EBUILD openrc-9999.ebuild 7197 RMD160 e166e8a6ee2afe3086fb63b94b116969eca6d20a SHA1 28fdec47cbc184798c0d08fa044c452f94246e28 SHA256 144b40fef01f5866857fe1200fb1e5edd8f82f15df85ccc0db1d969c10018761
-MISC ChangeLog 2443 RMD160 05778dce098d994044d00ae43188ff189e0bc32f SHA1 f821865051e92e0868c155bdf64dabf86854e5e1 SHA256 c03c412f8e5012afda31369a3c99dd55dce2fbbf0ce67722f75d2f424708b235
+EBUILD openrc-0.2-r2.ebuild 8226 RMD160 86b635ee032298991ded9d18a7b2970a68c26f1e SHA1 d33a751a491ab382dc09d25280fe91067593e4d1 SHA256 1c5b7f93adcffd3a79d2a095395d7b74e04a3efe82841222b4a90e8443b38165
+EBUILD openrc-9999.ebuild 7945 RMD160 5968d72df9489d98ff878c23f581ca4945c43741 SHA1 0bae3295c71e9e67a6135894559ab46c4bb052a1 SHA256 231cadb601280394b73e4e9805b799e0fac47fe2c90a9725e619895ed7451954
+MISC ChangeLog 2608 RMD160 7301f8ec163f5d8c5c35288648c4168fb56f7540 SHA1 c7b39230e6ea39c6cb0dc740a9dcea39db56007a SHA256 28d79824f17595af118c3878144b0eb449e7748ffb1185760908333ae7cb6ed8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH77txj9hvisErhMIRAkNtAJ9rM7+miaQ0ecTs34U0PYi6DJwkFACgwp0H
+YAsQ25vdudJH7m4P4EPrPXg=
+=IrQl
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.2-r2.ebuild b/sys-apps/openrc/openrc-0.2-r2.ebuild
index c6b3e0e24cd2..ec38d1837755 100644
--- a/sys-apps/openrc/openrc-0.2-r2.ebuild
+++ b/sys-apps/openrc/openrc-0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.3 2008/03/29 17:50:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.4 2008/03/30 16:06:45 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -105,6 +105,22 @@ src_install() {
 	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
 }
 
+add_boot_init() {
+	local initd=$1
+	[[ -e ${ROOT}/etc/init.d/${initd} ]] || return
+	[[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
+	elog "Auto-adding '${initd}' service to your boot runlevel"
+	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${ROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+			maybe_add_boot_init ${initd}
+		fi
+	fi
+}
+
 pkg_preinst() {
 	local f
 
@@ -156,11 +172,17 @@ pkg_preinst() {
 
 	# baselayout boot init scripts have been split out
 	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		[[ -e ${ROOT}/etc/runlevels/boot/${f} ]] && continue
-		elog "Auto-adding '${f}' service to your boot runlevel"
-		ln -snf /etc/init.d/${f} "${ROOT}"/etc/runlevels/boot/${f}
+		add_boot_init ${f}
 	done
 
+	# Try to auto-add some addons when possible
+	add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
+	add_boot_init_mit_config /etc/mdadm.conf mdraid
+	[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+	elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
+	elog "init.d scripts.  If you use such a thing, make sure you have the"
+	elog "required init.d scripts added to your boot runlevel."
+
 	# Upgrade out state for baselayout-1 users
 	if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
 		(
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index b8014261fdf8..da2d73558bba 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.15 2008/03/28 18:56:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.16 2008/03/30 16:06:45 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -98,6 +98,22 @@ src_install() {
 	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
 }
 
+add_boot_init() {
+	local initd=$1
+	[[ -e ${ROOT}/etc/init.d/${initd} ]] || return
+	[[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
+	elog "Auto-adding '${initd}' service to your boot runlevel"
+	ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${ROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+			maybe_add_boot_init ${initd}
+		fi
+	fi
+}
+
 pkg_preinst() {
 	local f
 
@@ -149,11 +165,17 @@ pkg_preinst() {
 
 	# baselayout boot init scripts have been split out
 	for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		[[ -e ${ROOT}/etc/runlevels/boot/${f} ]] && continue
-		elog "Auto-adding '${f}' service to your boot runlevel"
-		ln -snf /etc/init.d/${f} "${ROOT}"/etc/runlevels/boot/${f}
+		add_boot_init ${f}
 	done
 
+	# Try to auto-add some addons when possible
+	add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
+	add_boot_init_mit_config /etc/mdadm.conf mdraid
+	[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+	elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
+	elog "init.d scripts.  If you use such a thing, make sure you have the"
+	elog "required init.d scripts added to your boot runlevel."
+
 	# Upgrade out state for baselayout-1 users
 	if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
 		(