summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-05-05 03:54:32 +0000
committerMike Frysinger <vapier@gentoo.org>2008-05-05 03:54:32 +0000
commitab9efc2cb9ca12f894b85eabe115dbf325d3e17e (patch)
tree3d8401a704a28fc9a98a0ca2c52e42c7b1d2c180 /sys-apps/openrc
parentold (diff)
downloadgentoo-2-ab9efc2cb9ca12f894b85eabe115dbf325d3e17e.tar.gz
gentoo-2-ab9efc2cb9ca12f894b85eabe115dbf325d3e17e.tar.bz2
gentoo-2-ab9efc2cb9ca12f894b85eabe115dbf325d3e17e.zip
dont use find for net.* symlinks #219822
(Portage version: 2.2_pre5, RepoMan options: --force)
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r--sys-apps/openrc/openrc-0.2.2.ebuild5
-rw-r--r--sys-apps/openrc/openrc-0.2.3.ebuild5
-rw-r--r--sys-apps/openrc/openrc-9999.ebuild5
3 files changed, 9 insertions, 6 deletions
diff --git a/sys-apps/openrc/openrc-0.2.2.ebuild b/sys-apps/openrc/openrc-0.2.2.ebuild
index c5afdf242432..47d50f2beab5 100644
--- a/sys-apps/openrc/openrc-0.2.2.ebuild
+++ b/sys-apps/openrc/openrc-0.2.2.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.2.ebuild,v 1.5 2008/04/19 20:40:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.2.ebuild,v 1.6 2008/05/05 03:54:32 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -158,7 +158,8 @@ pkg_preinst() {
fi
# force net init.d scripts into symlinks
- for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do
+ for f in "${ROOT}"/etc/init.d/net.* ; do
+ [[ -e ${f} ]] || continue # catch net.* not matching anything
[[ ${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-0.2.3.ebuild b/sys-apps/openrc/openrc-0.2.3.ebuild
index 6e27b4c18be3..051971783012 100644
--- a/sys-apps/openrc/openrc-0.2.3.ebuild
+++ b/sys-apps/openrc/openrc-0.2.3.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.3.ebuild,v 1.1 2008/04/29 19:18:37 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.3.ebuild,v 1.2 2008/05/05 03:54:32 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -158,7 +158,8 @@ pkg_preinst() {
fi
# force net init.d scripts into symlinks
- for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do
+ for f in "${ROOT}"/etc/init.d/net.* ; do
+ [[ -e ${f} ]] || continue # catch net.* not matching anything
[[ ${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 eafc2729988e..901e745785d1 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.32 2008/04/19 20:40:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.33 2008/05/05 03:54:32 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -158,7 +158,8 @@ pkg_preinst() {
fi
# force net init.d scripts into symlinks
- for f in $(find "${ROOT}"/etc/init.d/ -name 'net.*') ; do
+ for f in "${ROOT}"/etc/init.d/net.* ; do
+ [[ -e ${f} ]] || continue # catch net.* not matching anything
[[ ${f} == *.openrc.bak ]] && continue
if [[ ! -L ${f} ]] ; then
elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."