summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-06-01 03:01:37 +0000
committerMike Frysinger <vapier@gentoo.org>2008-06-01 03:01:37 +0000
commite39ee6486a1e10d97e051c22e0afb45df3fdff34 (patch)
treeaae2971242e205220b3c21fc3ccd9a6a0dcf9fab /sys-apps/openrc
parentfix DESTDIR/DISTDIR typo pointed out by Sigmatador #223185 (diff)
downloadgentoo-2-e39ee6486a1e10d97e051c22e0afb45df3fdff34.tar.gz
gentoo-2-e39ee6486a1e10d97e051c22e0afb45df3fdff34.tar.bz2
gentoo-2-e39ee6486a1e10d97e051c22e0afb45df3fdff34.zip
Fix net.lo test in upgrade path as pointed out by compguy284 #224425.
(Portage version: 2.2_pre5.spank.spunk)
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r--sys-apps/openrc/ChangeLog6
-rw-r--r--sys-apps/openrc/openrc-0.2.5.ebuild4
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index d44450ccaf98..e42c63287a70 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.38 2008/05/31 07:04:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.39 2008/06/01 03:01:37 vapier Exp $
+
+ 01 Jun 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2.5.ebuild,
+ openrc-9999.ebuild:
+ Fix net.lo test in upgrade path as pointed out by compguy284 #224425.
31 May 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2.5.ebuild,
openrc-9999.ebuild:
diff --git a/sys-apps/openrc/openrc-0.2.5.ebuild b/sys-apps/openrc/openrc-0.2.5.ebuild
index 89a8cc226740..974e226e71bf 100644
--- a/sys-apps/openrc/openrc-0.2.5.ebuild
+++ b/sys-apps/openrc/openrc-0.2.5.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.5.ebuild,v 1.2 2008/05/31 07:04:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v 1.3 2008/06/01 03:01:37 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -160,7 +160,7 @@ pkg_preinst() {
# force net init.d scripts into symlinks
for f in "${ROOT}"/etc/init.d/net.* ; do
[[ -e ${f} ]] || continue # catch net.* not matching anything
- [[ ${f} == *.net.lo ]] && continue # real file now
+ [[ ${f} == */net.lo ]] && continue # real file now
[[ ${f} == *.openrc.bak ]] && continue
if [[ ! -L ${f} ]] ; then
elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index fd3a8413ee93..bf281e376475 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.35 2008/05/31 07:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.36 2008/06/01 03:01:37 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -160,7 +160,7 @@ pkg_preinst() {
# force net init.d scripts into symlinks
for f in "${ROOT}"/etc/init.d/net.* ; do
[[ -e ${f} ]] || continue # catch net.* not matching anything
- [[ ${f} == *.net.lo ]] && continue # real file now
+ [[ ${f} == */net.lo ]] && continue # real file now
[[ ${f} == *.openrc.bak ]] && continue
if [[ ! -L ${f} ]] ; then
elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."