View | Details | Raw Unified | Return to bug 12659
Collapse All | Expand All

(-)a/etc/net/scripts/create-tuntap (-10 / +17 lines)
Lines 3-22 Link Here
3
pickup_defaults
3
pickup_defaults
4
pickup_options
4
pickup_options
5
5
6
if [ ! -c /dev/net/tun ]; then
6
ensure_tuntap_node() {
7
    $MODPROBE tun || {
7
	local i=3
8
	print_error "tuntap kernel module not found"
8
9
	exit 1
9
	[ -c /dev/net/tun ] && return 0
10
    }
10
	$MODPROBE tun || return 1
11
    [ -c /dev/net/tun ] || {
11
	while [ $i -gt 0 ] ; do
12
	print_error "tuntap control node does not exist"
12
		[ -c /dev/net/tun ] && break
13
	exit 1
13
		i=$(($i - 1))
14
    }
14
		usleep 30000
15
fi
15
	done
16
	[ -c /dev/net/tun ]
17
}
16
18
17
[ -x "${TUNCTL:=$DEFAULT_TUNCTL}" ] || {
19
[ -x "${TUNCTL:=$DEFAULT_TUNCTL}" ] || {
18
	print_error "$TUNCTL does not exist or is not executable. Try installing tunctl RPM."
20
	print_error "$TUNCTL does not exist or is not executable. Try installing tunctl RPM."
19
	exit 1
21
	exit 1
20
}
22
}
21
23
24
ensure_tuntap_node || {
25
	print_error "tuntap control node does not exist"
26
	exit 1
27
}
28
22
$TUNCTL -t "$NAME" ${TUNTAP_USER:+-u $TUNTAP_USER} > /dev/null
29
$TUNCTL -t "$NAME" ${TUNTAP_USER:+-u $TUNTAP_USER} > /dev/null

Return to bug 12659