Attachment #1891 for bug #11409

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

Lines 27-32 INSMOD=/sbin/insmod Link Here

(-)a/etc/net/options.d/00-default (-1 / +2 lines)
27	RMMOD=/sbin/rmmod	27	RMMOD=/sbin/rmmod
28	SYSCTL=/sbin/sysctl	28	SYSCTL=/sbin/sysctl
29	IFRENAME=/sbin/ifrename	29	IFRENAME=/sbin/ifrename
		30	TUNCTL=/usr/sbin/tunctl
30		31
31	# IPv4LL	32	# IPv4LL
32	ZCIP_CLIENT=/sbin/zcip	33	ZCIP_CLIENT=/sbin/zcip
Lines 65-71 NEVER_RMMOD=no Link Here
65	AUTO_BROADCAST=off	66	AUTO_BROADCAST=off
66		67
67	IFGROUP[0]='lo dummy'	68	IFGROUP[0]='lo dummy'
68	IFGROUP[1]='eth plip usb dvb bnep'	69	IFGROUP[1]='eth plip usb dvb bnep tuntap'
69	IFGROUP[2]='vlan bond bri teql'	70	IFGROUP[2]='vlan bond bri teql'
70	IFGROUP[3]='iptun ipsectun ovpn'	71	IFGROUP[3]='iptun ipsectun ovpn'
71	IFGROUP[4]='ppp'	72	IFGROUP[4]='ppp'




#!/bin/bash

pickup_defaults
pickup_options

if [ ! -c /dev/net/tun ]; then
    $MODPROBE tun || {
	print_error "tuntap kernel module not found"
	exit 1
    }
    [ -c /dev/net/tun ] || {
	print_error "tuntap control node does not exist"
	exit 1
    }
fi

[ -x "${TUNCTL:=$DEFAULT_TUNCTL}" ] || {
	print_error "$TUNCTL does not exist or is not executable. Try installing tunctl RPM."
	exit 1
}

$TUNCTL -t "$NAME" ${TUNTAP_USER:+-u $TUNTAP_USER} > /dev/null

Line 0 Link Here

(-)a/etc/net/scripts/destroy-tuntap (+11 lines)
	1	#!/bin/bash
	2
	3	pickup_defaults
	4	pickup_options
	5
	6	[ -x "${TUNCTL:=$DEFAULT_TUNCTL}" ] \|\| {
	7	print_error "$TUNCTL does not exist or is not executable. Try installing tunctl RPM."
	8	exit 1
	9	}
	10
	11	$TUNCTL -d "$NAME" > /dev/null

Lines 21-26 DEFAULT_PLIPCONFIG=/sbin/plipconfig Link Here

(-)a/etc/net/scripts/functions (+1 lines)
21	DEFAULT_VCONFIG=/usr/bin/vconfig	21	DEFAULT_VCONFIG=/usr/bin/vconfig
22	DEFAULT_IPSECADM=/usr/sbin/ipsecadm	22	DEFAULT_IPSECADM=/usr/sbin/ipsecadm
23	DEFAULT_IFENSLAVE=/sbin/ifenslave	23	DEFAULT_IFENSLAVE=/sbin/ifenslave
		24	DEFAULT_TUNCTL=/usr/sbin/tunctl
24	DEFAULT_BRCTL=/usr/sbin/brctl	25	DEFAULT_BRCTL=/usr/sbin/brctl
25	DEFAULT_ETHTOOL=/usr/sbin/ethtool	26	DEFAULT_ETHTOOL=/usr/sbin/ethtool
26	DEFAULT_PPPD=/usr/sbin/pppd	27	DEFAULT_PPPD=/usr/sbin/pppd

Return to bug 11409

Line 0 Link Here

(-)a/etc/net/scripts/create-tuntap (+22 lines)
	1	#!/bin/bash
	2
	3	pickup_defaults
	4	pickup_options
	5
	6	if [ ! -c /dev/net/tun ]; then
	7	$MODPROBE tun \|\| {
	8	print_error "tuntap kernel module not found"
	9	exit 1
	10	}
	11	[ -c /dev/net/tun ] \|\| {
	12	print_error "tuntap control node does not exist"
	13	exit 1
	14	}
	15	fi
	16
	17	[ -x "${TUNCTL:=$DEFAULT_TUNCTL}" ] \|\| {
	18	print_error "$TUNCTL does not exist or is not executable. Try installing tunctl RPM."
	19	exit 1
	20	}
	21
	22	$TUNCTL -t "$NAME" ${TUNTAP_USER:+-u $TUNTAP_USER} > /dev/null