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

Collapse All | Expand All

(-)pppd.sh-2101 (-3 / +12 lines)
Lines 144-152 Link Here
144
		[[ ${plugin[0]} == "pppoa" ]] && plugin[0]="pppoatm"
144
		[[ ${plugin[0]} == "pppoa" ]] && plugin[0]="pppoatm"
145
		[[ ${plugin[0]} == "capi" ]] && plugin[0]="capiplugin"
145
		[[ ${plugin[0]} == "capi" ]] && plugin[0]="capiplugin"
146
146
147
		[[ ${plugin[0]} == "rp-pppoe" ]] && opts="${opts} connect true"
147
		if [[ ${plugin[0]} == "rp-pppoe" || ${plugin[0]} == "pppoatm" ]] ; then
148
		opts="${opts} plugin ${plugin[0]}.so ${plugin[@]:1}"
148
			opts="${opts} connect true plugin ${plugin[0]}.so ${plugin[@]:1} ${!link}"
149
		[[ ${plugin[0]} == "rp-pppoe" ]] && opts="${opts} ${!link}"
149
		else
150
			opts="${opts} plugin ${plugin[0]}.so ${plugin[@]:1}"
151
		fi
150
	done
152
	done
151
153
152
	#Specialized stuff. Insert here actions particular to connection type (pppoe,pppoa,capi)
154
	#Specialized stuff. Insert here actions particular to connection type (pppoe,pppoa,capi)
Lines 168-173 Link Here
168
	fi
170
	fi
169
171
170
	if [[ " ${opts} " == *" plugin pppoatm.so "* ]] ; then
172
	if [[ " ${opts} " == *" plugin pppoatm.so "* ]] ; then
173
		if [[ ! ( ${!link} =~ '^[ \t]*([1-9]*[0-9]\.){1,2}[1-9]*[0-9][ \t]*$' ) ]] ; then
174
			eerror "an [itf.]vpi.vci ATM address was expected in ${link}"
175
			return 1
176
		fi
177
171
		if [[ ! -d /proc/net/atm ]] ; then
178
		if [[ ! -d /proc/net/atm ]] ; then
172
			# Load the PPPoA kernel module
179
			# Load the PPPoA kernel module
173
			if ! modprobe pppoatm ; then
180
			if ! modprobe pppoatm ; then
Lines 175-180 Link Here
175
				return 1
182
				return 1
176
			fi
183
			fi
177
		fi
184
		fi
185
186
		insert_link_in_opts=0
178
	fi
187
	fi
179
	[[ ${insert_link_in_opts} -eq 0 ]] || opts="${!link} ${opts}"
188
	[[ ${insert_link_in_opts} -eq 0 ]] || opts="${!link} ${opts}"
180
189

Return to bug 144194