* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog openrc-0.2-r1.ebuild
@ 2008-03-28 18:56 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2008-03-28 18:56 UTC (permalink / raw
To: gentoo-commits
vapier 08/03/28 18:56:57
Modified: openrc-9999.ebuild ChangeLog openrc-0.2-r1.ebuild
Log:
Make sure net init.d scripts are symlinks #215233 by Andrey Kislyuk.
(Portage version: 2.2_pre5)
Revision Changes Path
1.15 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.14&r2=1.15
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openrc-9999.ebuild 28 Mar 2008 16:57:35 -0000 1.14
+++ openrc-9999.ebuild 28 Mar 2008 18:56:57 -0000 1.15
@@ -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 @@
}
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 @@
)
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
1.13 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.12&r2=1.13
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog 28 Mar 2008 16:57:35 -0000 1.12
+++ ChangeLog 28 Mar 2008 18:56:57 -0000 1.13
@@ -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:
1.8 sys-apps/openrc/openrc-0.2-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild?r1=1.7&r2=1.8
Index: openrc-0.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openrc-0.2-r1.ebuild 28 Mar 2008 16:57:35 -0000 1.7
+++ openrc-0.2-r1.ebuild 28 Mar 2008 18:56:57 -0000 1.8
@@ -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 @@
}
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 @@
)
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
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-03-28 18:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-28 18:56 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild ChangeLog openrc-0.2-r1.ebuild Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox