From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rq7t7-00018G-2s for garchives@archives.gentoo.org; Wed, 25 Jan 2012 18:48:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C65A5E065E; Wed, 25 Jan 2012 18:47:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 97D94E065E for ; Wed, 25 Jan 2012 18:47:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 306331B405F for ; Wed, 25 Jan 2012 18:47:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 557F280510 for ; Wed, 25 Jan 2012 18:47:55 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: net/ X-VCS-Repository: proj/openrc X-VCS-Files: net/bonding.sh X-VCS-Directories: net/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: fb00b10669a0b191ba0467f035d45b77bedd9f09 Date: Wed, 25 Jan 2012 18:47:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 989cc517-9118-4614-bc3a-bf7d8872f74b X-Archives-Hash: 3bd9579524be79dac127395ec62cc1cd commit: fb00b10669a0b191ba0467f035d45b77bedd9f09 Author: Robin H. Johnson gentoo org> AuthorDate: Wed Jan 25 18:30:33 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Wed Jan 25 18:47:37 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Dfb00b106 net/bonding: Fix which interface IPs get added to. The previous bonding change of ensuring interfaces were down to add slave interfaces, but it clobbered the IFACE variable, because it was being passed to a bash function rather than a command. X-Gentoo-Bug: 400613 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=3D400613 Signed-off-by: Robin H. Johnson gentoo.org> --- net/bonding.sh | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net/bonding.sh b/net/bonding.sh index 6a83a8c..21c00e3 100644 --- a/net/bonding.sh +++ b/net/bonding.sh @@ -102,15 +102,21 @@ bonding_pre_start() eoutdent if [ -d /sys/class/net ]; then sys_bonding_path=3D/sys/class/net/"${IFACE}"/bonding + local oiface + oiface=3D$IFACE if [ -n "${primary}" ]; then - IFACE=3D$primary _down + IFACE=3D$primary=20 + _down + IFACE=3D$oiface echo "+${primary}" >$sys_bonding_path/slaves echo "${primary}" >$sys_bonding_path/primary fi for s in ${slaves}; do [ "${s}" =3D "${primary}" ] && continue if ! grep -q ${s} $sys_bonding_path/slaves; then - IFACE=3D$s _down + IFACE=3D$s=20 + _down + IFACE=3D$oiface echo "+${s}" >$sys_bonding_path/slaves fi done