emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tuntap: add iproute2 support

Browse Source 
This patch was modified by William Hubbs <williamh@gentoo.org> to
document the new usage in net.example.

X-Gentoo-Bug: 394281
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=394281
This commit is contained in:
Salah Coronya
2011-12-11 22:06:30 -06:00
committed by William Hubbs
parent 2569eb644e
commit a38a5071f3
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
net/tuntap.sh
View File

@@ -6,7 +6,7 @@ tuntap_depend()
before bridge interface macchanger
}
_config_vars="$_config_vars tunctl"
_config_vars="$_config_vars iproute2 openvpn tunctl"
_is_tuntap()
{
@@ -44,28 +44,36 @@ tuntap_pre_start()
# Set the base metric to 1000
metric=1000
local o_opts= t_opts= do_openvpn=false do_tunctl=false
local i_opts= o_opts= t_opts=
local do_iproute2=false do_openvpn=false do_tunctl=false
eval i_opts=\$iproute2_${IFVAR}
eval o_opts=\$openvpn_${IFVAR}
eval t_opts=\$tunctl_${IFVAR}
if [ -n "${o_opts}" ] && type openvpn >/dev/null 2>&1; then
if [ -n "${i_opts}" ] && type ip >/dev/null 2>&1; then
do_iproute2=true
elif [ -n "${o_opts}" ] && type openvpn >/dev/null 2>&1; then
do_openvpn=true
elif [ -n "${t_opts}" ] && type tunctl >/dev/null 2>&1; then
do_tunctl=true
elif type ip >/dev/null 2>&1; then
do_iproute2=true
elif type openvpn >/dev/null 2>&1; then
do_openvpn=true
elif type tunctl >/dev/null 2>&1; then
do_tunctl=true
fi
if ${do_openvpn}; then
if ${do_iproute2}; then
ip tuntap add dev "${IFACE}" mode "${tuntap}" ${i_opts}
elif ${do_openvpn}; then
openvpn --mktun --dev-type "${tuntap}" --dev "${IFACE}" \
${o_opts} >/dev/null
elif ${do_tunctl}; then
tunctl ${t_opts} -t "${IFACE}" >/dev/null
else
eerror "Neither openvpn nor tunctl has been found, please install"
eerror "either \"openvpn\" or \"usermode-utilities\"."
eerror "Neither iproute2, openvpn nor tunctl has been found, please install"
eerror "either \"iproute2\" \"openvpn\" or \"usermode-utilities\"."
fi
eend $? && _up && service_set_value tuntap "${tuntap}"
}
@@ -75,7 +83,9 @@ tuntap_post_stop()
_is_tuntap || return 0
ebegin "Destroying Tun/Tap interface ${IFACE}"
if type tunctl >/dev/null 2>&1; then
if type ip > /dev/null 2>&1; then
ip tuntap del dev ${IFACE} mode $(service_get_value tuntap)
elif type tunctl >/dev/null 2>&1; then
tunctl -d "${IFACE}" >/dev/null
else
openvpn --rmtun \