diff options
| author | William Hubbs <williamh@gentoo.org> | 2011-12-29 18:00:25 -0600 | 
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2011-12-29 18:00:25 -0600 | 
| commit | 759f4ca4f2a7ee6be9ed13e7fd3fcd9cce44d865 (patch) | |
| tree | ed5e197e357e578e643980766d6fb511a2ce38f6 /net | |
| parent | 6c8e8e2a964d28cc3924e61a371412f97d51b771 (diff) | |
| download | openrc-759f4ca4f2a7ee6be9ed13e7fd3fcd9cce44d865.tar.xz | |
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 <marienz@gentoo.org>
X-Gentoo-Bug: 396427
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=396427
Diffstat (limited to 'net')
| -rw-r--r-- | net/macvlan.sh | 13 | 
1 files changed, 0 insertions, 13 deletions
diff --git a/net/macvlan.sh b/net/macvlan.sh index b8a8ffa2..fb5fcdb4 100644 --- a/net/macvlan.sh +++ b/net/macvlan.sh @@ -24,17 +24,6 @@ _is_macvlan()  	[ -n "$(export RC_SVCNAME="net.${IFACE}"; service_get_value macvlan)" ]  } -_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=\$macvlan_${IFVAR}  	[ -z "${macvlan}" ] && return 0 -	_check_macvlan || return 1 -  	case " ${MODULES} " in  		*" ifconfig "*)  				eerror "sys-apps/iproute2 is required to configure MACVLANs"  | 
