Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 428604 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-11 / +48 lines)
Line 26 Link Here
26
	eval subsume="\$subsume_${IFVAR}"
27
	unset subsume_${IFVAR}
28
Line 80 Link Here
83
	eoutdent
Lines 87-91 Link Here
87
	# Must force the slaves to a particular state before adding them
91
	# Unless we are subsuming an existing interface (NFS root), we down
88
	for IFACE in ${slaves}; do
92
	# slave interfaces to work around bugs supposedly in some chipsets
89
		_delete_addresses
93
	# that cause failure to enslave from other states.
90
		_down
94
	if [ ! -n "${subsume}" ]; then
91
	done
95
		for IFACE in ${slaves}; do
92
--
96
			_delete_addresses
97
			_down
98
		done
99
	fi
Lines 94-95 Link Here
94
	# now force the master to up
102
	# Now force the master to up
95
	_up
103
	#  - First test for interface subsume request (required for NFS root)
96
--
104
	if [ -n "${subsume}" ]; then
105
                einfo "Subsuming ${subsume} interface characteristics."
106
                eindent
107
                local oiface=${IFACE}
108
                IFACE=${subsume}
109
                local addr="$(_get_inet_address)"
110
                einfo "address: ${addr}"
111
                IFACE=${oiface}
112
                unset oiface
113
                eoutdent
114
                # subsume (presumably kernel auto-)configured IP
115
                /sbin/ifconfig ${IFACE} ${addr} up
116
        else
117
		# warn if root on nfs and no subsume interface supplied
118
		local root_fs_type=$(mountinfo -s /)
119
                if [ ${root_fs_type} == "nfs" ]; then
120
			warn_nfs=1
121
			ewarn "NFS root detected!!!"
122
			ewarn " If your system crashes here, /etc/conf.d/net needs"
123
			ewarn " subsume_${IFACE}=\"<iface>\" ... where <iface> is the"
124
			ewarn " existing, (usually kernel auto-)configured interface."
125
                fi
126
                # up the interface
127
                _up
128
        fi
129
Line 97 Link Here
97
	# finally add in slaves
131
	# Finally add in slaves
98
--
Line 126 Link Here
160
161
	# Wipe subsumed interface
162
	if [ -n "${subsume}" ]; then
163
		/sbin/ifconfig ${subsume} 0.0.0.0
164
	fi
165

Return to bug 428604