* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild openrc-0.2.1.ebuild ChangeLog
@ 2008-04-02 19:23 Doug Klima (cardoe)
0 siblings, 0 replies; only message in thread
From: Doug Klima (cardoe) @ 2008-04-02 19:23 UTC (permalink / raw
To: gentoo-commits
cardoe 08/04/02 19:23:45
Modified: openrc-9999.ebuild openrc-0.2.1.ebuild ChangeLog
Log:
fix issue with installing boot initscripts that are provided by currently installing copy of OpenRC
(Portage version: 2.1.4.4)
Revision Changes Path
1.21 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.20&r2=1.21
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- openrc-9999.ebuild 31 Mar 2008 19:25:09 -0000 1.20
+++ openrc-9999.ebuild 2 Apr 2008 19:23:45 -0000 1.21
@@ -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.20 2008/03/31 19:25:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.21 2008/04/02 19:23:45 cardoe Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -101,7 +101,10 @@
add_boot_init() {
local initd=$1
- [[ -e ${ROOT}/etc/init.d/${initd} ]] || return
+ # 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
elog "Auto-adding '${initd}' service to your boot runlevel"
ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
1.2 sys-apps/openrc/openrc-0.2.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2.1.ebuild?r1=1.1&r2=1.2
Index: openrc-0.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openrc-0.2.1.ebuild 2 Apr 2008 16:51:15 -0000 1.1
+++ openrc-0.2.1.ebuild 2 Apr 2008 19:23:45 -0000 1.2
@@ -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.1.ebuild,v 1.1 2008/04/02 16:51:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.1.ebuild,v 1.2 2008/04/02 19:23:45 cardoe Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -103,7 +103,10 @@
add_boot_init() {
local initd=$1
- [[ -e ${ROOT}/etc/init.d/${initd} ]] || return
+ # 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
elog "Auto-adding '${initd}' service to your boot runlevel"
ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
1.22 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 2 Apr 2008 16:51:15 -0000 1.21
+++ ChangeLog 2 Apr 2008 19:23:45 -0000 1.22
@@ -1,6 +1,11 @@
# 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.21 2008/04/02 16:51:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.22 2008/04/02 19:23:45 cardoe Exp $
+
+ 02 Apr 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2.1.ebuild,
+ openrc-9999.ebuild:
+ fix issue with installing boot initscripts that are provided by currently
+ installing copy of OpenRC
*openrc-0.2.1 (02 Apr 2008)
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-02 19:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-02 19:23 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-9999.ebuild openrc-0.2.1.ebuild ChangeLog Doug Klima (cardoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox