Make sure net init.d scripts are symlinks #215233 by Andrey Kislyuk.

Package-Manager: portage-2.2_pre5

4 files changed, 45 insertions, 19 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 2b7a83a255e5..b2d5d07b78f4 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.12 2008/03/28 16:57:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.13 2008/03/28 18:56:57 vapier Exp $
+
+  28 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r1.ebuild,
+  openrc-9999.ebuild:
+  Make sure net init.d scripts are symlinks #215233 by Andrey Kislyuk.
 
   28 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r1.ebuild,
   openrc-9999.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index a31fe2bac6f8..a5f0c1ef67fa 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 AUX openrc-0.2-freebsd-install-rc.patch 888 RMD160 5f3c421d389bf1d5ca8113ee7566b2fa9f3dd89d SHA1 e4f0ab407b88f28e3ce696e63ee0450338c3ca1a SHA256 a14eadfc0cb2da40d53783f73b4d8474827baaf7a38f21fd5c1050d295cff14e
 DIST openrc-0.2.tar.bz2 141615 RMD160 282122e6b152e3b86483eb2b3e90565adb11f08f SHA1 b41a9981b6d0e3963e278c37b292d3f4877bb8fc SHA256 5f8f718ef0c1e3188b7b19fc868fdf5719fc5a1a65d4376f2becd3b78ccc2ef1
-EBUILD openrc-0.2-r1.ebuild 6957 RMD160 d2702dd645361d85d2f0bd46319b5ee2bb9b2bfd SHA1 ee23478213f49de9b34d9b3142416f600fe9de48 SHA256 858637d0a40e9cd56bbea0a58597f3e44cb9fe4152207e8203d6380cb2bbc725
-EBUILD openrc-9999.ebuild 6860 RMD160 afc6c767ed9d258860bdb99ae3ed59da8d002207 SHA1 4bf0efe7b903ced7367d9a6534b6ba0300c8d83f SHA256 e644d595ee678eeeab6b0ad917753d5bda821029b861b547041bbfe43386ae09
-MISC ChangeLog 1833 RMD160 ea93ebe88a29bc1fde153c2575eb76eb47794e39 SHA1 18a278718711fae518b0039041e8a7330be6e895 SHA256 0ee24bcb2d320aa3a6fbf1f569538edac6124e0164ea652db3f4372825784e51
+EBUILD openrc-0.2-r1.ebuild 7294 RMD160 dea20dda3750873e5d8eff9336fbdbce8f85a0d0 SHA1 9598a23c1870b7377e317a9580dfde5bab2e443a SHA256 c1a894c681719b56ab6fc4753e09ab0a8a2c77ab424bf3ae46f706eb9a41be37
+EBUILD openrc-9999.ebuild 7197 RMD160 e166e8a6ee2afe3086fb63b94b116969eca6d20a SHA1 28fdec47cbc184798c0d08fa044c452f94246e28 SHA256 144b40fef01f5866857fe1200fb1e5edd8f82f15df85ccc0db1d969c10018761
+MISC ChangeLog 1999 RMD160 431240278fcab539638b61066716c20105354629 SHA1 2ef622df45c1516dde835bb900d28ef8ad21266b SHA256 e51a512f04e51f7df7919bf22e10ba9a5a537f7368825e72e3001eecdca2a0b8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH7SRHj9hvisErhMIRAhznAJ4r93eiEk4YoBoZ26KfDc+QnZPXMQCeP3sG
-IS0KW8UE79I+XC10nthHMUQ=
-=Pfcl
+iD8DBQFH7UBCj9hvisErhMIRApDcAJ9R9TfatYz3TAR6rU+HBjfJoKu1/ACfTFpq
+P1gLwrBGJq3eZ2gkFeQ3n60=
+=OKSe
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.2-r1.ebuild b/sys-apps/openrc/openrc-0.2-r1.ebuild
index 48b111778a64..32d8c18b09fc 100644
--- a/sys-apps/openrc/openrc-0.2-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.2-r1.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-r1.ebuild,v 1.7 2008/03/28 16:57:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild,v 1.8 2008/03/28 18:56:57 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -101,6 +101,8 @@ src_install() {
 }
 
 pkg_preinst() {
+	local f
+
 	# default net script is just comments, so no point in biting people
 	# in the ass by accident
 	[[ -e ${ROOT}/etc/conf.d/net ]] && rm -f "${D}"/etc/conf.d/net
@@ -134,15 +136,24 @@ pkg_preinst() {
 		)
 	fi
 
+	# force net init.d scripts into symlinks
+	for f in "${ROOT}"/etc/init.d/net.* ; do
+		if [[ ! -L ${f} ]] ; then
+			elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
+			elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
+			mv "${f}" "${f}.openrc.bak"
+			ln -snf net.lo "${f}"
+		fi
+	done
+
 	# skip remaining migration if we already have openrc installed
 	has_version sys-apps/openrc && return 0
 
 	# baselayout boot init scripts have been split out
-	local x
-	for x in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		[[ -e ${ROOT}/etc/runlevels/boot/${x} ]] && continue
-		elog "Auto-adding '${x}' service to your boot runlevel"
-		ln -snf /etc/init.d/${x} "${ROOT}"/etc/runlevels/boot/${x}
+	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}
 	done
 
 	# Upgrade out state for baselayout-1 users
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index e789c794b7c2..b8014261fdf8 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.14 2008/03/28 16:57:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.15 2008/03/28 18:56:57 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -99,6 +99,8 @@ src_install() {
 }
 
 pkg_preinst() {
+	local f
+
 	# default net script is just comments, so no point in biting people
 	# in the ass by accident
 	[[ -e ${ROOT}/etc/conf.d/net ]] && rm -f "${D}"/etc/conf.d/net
@@ -132,15 +134,24 @@ pkg_preinst() {
 		)
 	fi
 
+	# force net init.d scripts into symlinks
+	for f in "${ROOT}"/etc/init.d/net.* ; do
+		if [[ ! -L ${f} ]] ; then
+			elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
+			elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
+			mv "${f}" "${f}.openrc.bak"
+			ln -snf net.lo "${f}"
+		fi
+	done
+
 	# skip remaining migration if we already have openrc installed
 	has_version sys-apps/openrc && return 0
 
 	# baselayout boot init scripts have been split out
-	local x
-	for x in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
-		[[ -e ${ROOT}/etc/runlevels/boot/${x} ]] && continue
-		elog "Auto-adding '${x}' service to your boot runlevel"
-		ln -snf /etc/init.d/${x} "${ROOT}"/etc/runlevels/boot/${x}
+	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}
 	done
 
 	# Upgrade out state for baselayout-1 users