[patch] support subsuming kernel autoconfigured interface + warn on nfs root (v2)

bonding.sh-0.10.5-nfsroot-subsume-2.patch (text/plain), 1.89 KB, created by Walter on 2012-07-31 08:39:56 UTC

25a26,28
> 	eval subsume="\$subsume_${IFVAR}"
> 	unset subsume_${IFVAR}
> 
79a83
> 	eoutdent
87,91c91,99
< 	# Must force the slaves to a particular state before adding them
< 	for IFACE in ${slaves}; do
< 		_delete_addresses
< 		_down
< 	done
---
> 	# Unless we are subsuming an existing interface (NFS root), we down
> 	# slave interfaces to work around bugs supposedly in some chipsets
> 	# that cause failure to enslave from other states.
> 	if [ ! -n "${subsume}" ]; then
> 		for IFACE in ${slaves}; do
> 			_delete_addresses
> 			_down
> 		done
> 	fi
94,95c102,129
< 	# now force the master to up
< 	_up
---
> 	# Now force the master to up
> 	#  - First test for interface subsume request (required for NFS root)
> 	if [ -n "${subsume}" ]; then
>                 einfo "Subsuming ${subsume} interface characteristics."
>                 eindent
>                 local oiface=${IFACE}
>                 IFACE=${subsume}
>                 local addr="$(_get_inet_address)"
>                 einfo "address: ${addr}"
>                 IFACE=${oiface}
>                 unset oiface
>                 eoutdent
>                 # subsume (presumably kernel auto-)configured IP
>                 /sbin/ifconfig ${IFACE} ${addr} up
>         else
> 		# warn if root on nfs and no subsume interface supplied
> 		local root_fs_type=$(mountinfo -s /)
>                 if [ ${root_fs_type} == "nfs" ]; then
> 			warn_nfs=1
> 			ewarn "NFS root detected!!!"
> 			ewarn " If your system crashes here, /etc/conf.d/net needs"
> 			ewarn " subsume_${IFACE}=\"<iface>\" ... where <iface> is the"
> 			ewarn " existing, (usually kernel auto-)configured interface."
>                 fi
>                 # up the interface
>                 _up
>         fi
> 
97c131
< 	# finally add in slaves
---
> 	# Finally add in slaves
125a160,165
> 
> 	# Wipe subsumed interface
> 	if [ -n "${subsume}" ]; then
> 		/sbin/ifconfig ${subsume} 0.0.0.0
> 	fi
>