Attachment 112632 Details for Bug 154062 – ng_char4vlan.diff

[patch] ng_char4vlan.diff

ng_char4vlan.diff (text/plain), 2.01 KB, created by Roman Bogorodskiy on 2011-01-16 19:00:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2011-01-16 19:00:18 UTC

Size: 2.01 KB

patch

obsolete

>*** etc/network.subr.orig	Tue Dec 28 07:48:40 2010
>--- etc/network.subr	Wed Dec 29 21:42:21 2010
>***************
>*** 564,576 ****
>  
>  	if [ -n "${child_vlans}" ]; then
>  		load_kld if_vlan
>  	fi
>  
>  	for child in ${child_vlans}; do
>  		if expr $child : '[1-9][0-9]*$' >/dev/null 2>&1; then
>! 			child="${ifn}.${child}"
>! 			create_args=`get_if_var $child create_args_IF`
>! 			ifconfig $child create ${create_args} && cfg=0
>  		else
>  			create_args="vlandev $ifn `get_if_var $child create_args_IF`"
>  			if expr $child : 'vlan[0-9][0-9]*$' >/dev/null 2>&1; then
>--- 564,587 ----
>  
>  	if [ -n "${child_vlans}" ]; then
>  		load_kld if_vlan
>+ 		if [ "${ng_char4vlan}" != "." && "${ng_char4vlan}" != ":" ]; then
>+ 			load_kld netgraph
>+ 		fi
>  	fi
>  
>  	for child in ${child_vlans}; do
>  		if expr $child : '[1-9][0-9]*$' >/dev/null 2>&1; then
>! 			if [ "${ng_char4vlan}" = "." ]; then
>! 				child="${ifn}.${child}"
>! 				create_args=`get_if_var $child create_args_IF`
>! 				ifconfig $child create ${create_args} && cfg=0
>! 			else
>! 				create_args="vlandev $ifn vlan $child `get_if_var ${ifn}_${child} create_args_IF`"
>! 				child="${ifn}${ng_char4vlan}${child}"
>! 				i=`ifconfig vlan create ${create_args}`
>! 				ngctl name "${i}:" $child
>! 				ifconfig $i name $child && cfg=0
>! 			fi
>  		else
>  			create_args="vlandev $ifn `get_if_var $child create_args_IF`"
>  			if expr $child : 'vlan[0-9][0-9]*$' >/dev/null 2>&1; then
>*** etc/defaults/rc.conf.orig	Wed Dec 29 19:47:01 2010
>--- etc/defaults/rc.conf	Wed Dec 29 19:48:41 2010
>***************
>*** 211,216 ****
>--- 211,217 ----
>  #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
>  #ifconfig_ed0_ipx="ipx 0x00010010"	# Sample IPX address family entry.
>  #ifconfig_fxp0_name="net0"	# Change interface name from fxp0 to net0.
>+ ng_char4vlan="."		# Must be changed for work with netgraph system.
>  #vlans_fxp0="101 vlan0"		# vlan(4) interfaces for fxp0 device
>  #create_arg_vlan0="vlan 102"	# vlan tag for vlan0 device
>  #wlans_ath0="wlan0"		# wlan(4) interfaces for ath0 device

Actions: View | Diff

Attachments on bug 154062: 112632