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 1RCIGv-0003LP-DW for garchives@archives.gentoo.org; Fri, 07 Oct 2011 21:48:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92B7D21C054; Fri, 7 Oct 2011 21:47:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6214621C054 for ; Fri, 7 Oct 2011 21:47:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCC171B4016 for ; Fri, 7 Oct 2011 21:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4E87D80042 for ; Fri, 7 Oct 2011 21:47:53 +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/vlan.sh X-VCS-Directories: net/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: f6c27abeb571d1025e2f2c7a53c734d21ad285cf Date: Fri, 7 Oct 2011 21:47:53 +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: X-Archives-Hash: 1c63f9dd7613a593106f703ba9bc2585 commit: f6c27abeb571d1025e2f2c7a53c734d21ad285cf Author: Robin H. Johnson gentoo org> AuthorDate: Fri Oct 7 21:45:46 2011 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Oct 7 21:47:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Df6c27abe net/vlan: respect txqueuelen/mac/broadcast/mtu options during creation. Signed-off-by: Robin H. Johnson gentoo.org> --- net/vlan.sh | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/net/vlan.sh b/net/vlan.sh index c7e5748..6eed36b 100644 --- a/net/vlan.sh +++ b/net/vlan.sh @@ -77,7 +77,17 @@ vlan_post_start() eval vegress=3D\$vlan${vlan}_egress [ -z "${vegress}" ] || vegress=3D"egress-qos-map ${vegress}" =20 - e=3D"$(ip link add link "${IFACE}" name "${vname}" type vlan id "${vla= n}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)" + local txqueuelen=3D + eval txqueuelen=3D\$txqueuelen_vlan${vlan} + local mac=3D + eval mac=3D\$mac_vlan${vlan} + local broadcast=3D + eval broadcast=3D\$broadcast_vlan${vlan} + local mtu=3D + eval mtu=3D\$mtu_vlan${vlan} + local opts=3D"${txqueuelen:+txqueuelen} ${txqueuelen} ${mac:+address} = ${mac} ${broadcast:+broadcast} ${broadcast} ${mtu+:mtu} ${mtu}" + + e=3D"$(ip link add link "${IFACE}" name "${vname}" ${opts} type vlan i= d "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)" if [ -n "${e}" ]; then eend 1 "${e}" continue