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 1RgQ4u-0004Qy-8A for garchives@archives.gentoo.org; Fri, 30 Dec 2011 00:12:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7263B21C07A; Fri, 30 Dec 2011 00:12:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3D3F521C07A for ; Fri, 30 Dec 2011 00:12:00 +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 AEF611B4087 for ; Fri, 30 Dec 2011 00:11:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D3D8280043 for ; Fri, 30 Dec 2011 00:11:58 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <759f4ca4f2a7ee6be9ed13e7fd3fcd9cce44d865.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: net/ X-VCS-Repository: proj/openrc X-VCS-Files: net/macvlan.sh X-VCS-Directories: net/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 759f4ca4f2a7ee6be9ed13e7fd3fcd9cce44d865 Date: Fri, 30 Dec 2011 00:11:58 +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: 505aceaa-4f3f-4396-a740-3799e694911a X-Archives-Hash: 740092be8372e1da21e27cb2afae524c commit: 759f4ca4f2a7ee6be9ed13e7fd3fcd9cce44d865 Author: William Hubbs gentoo org> AuthorDate: Fri Dec 30 00:00:25 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Dec 30 00:00:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D759f4ca4 net: remove _check_macvlan function This test is incorrect, and we do not need the modprobe. If macvlan is a module, it is automatically modprobed when the first macvlan link is added. Also, the /sys directory referred to in the test does not exist if macvlan is built into the kernel. Reported-by: Marien Zwart gentoo.org> X-Gentoo-Bug: 396427 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=3D396427 --- net/macvlan.sh | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/net/macvlan.sh b/net/macvlan.sh index b8a8ffa..fb5fcdb 100644 --- a/net/macvlan.sh +++ b/net/macvlan.sh @@ -24,17 +24,6 @@ _is_macvlan() [ -n "$(export RC_SVCNAME=3D"net.${IFACE}"; service_get_value macvlan)"= ] } =20 -_check_macvlan() -{ - if [ ! -d /sys/module/macvlan ]; then - modprobe macvlan - if [ ! -d /sys/module/macvlan ]; then - eerror "MAC-VLAN support is not present in this kernel" - return 1 - fi - fi -} - macvlan_pre_start() { # MAC-VLAN needs an existing interface to link to @@ -42,8 +31,6 @@ macvlan_pre_start() eval macvlan=3D\$macvlan_${IFVAR} [ -z "${macvlan}" ] && return 0 =20 - _check_macvlan || return 1 - case " ${MODULES} " in *" ifconfig "*) eerror "sys-apps/iproute2 is required to configure MACVLANs"