|
Lines 146-154
Link Here
|
| 146 |
opts="${!opts}" |
146 |
opts="${!opts}" |
| 147 |
|
147 |
|
| 148 |
# We don't work with these options set by the user |
148 |
# We don't work with these options set by the user |
| 149 |
for i in unit nodetach linkname maxfail persist ; do |
149 |
for i in unit nodetach linkname ; do |
| 150 |
if [[ " ${opts} " == *" ${i} "* ]]; then |
150 |
if [[ " ${opts} " == *" ${i} "* ]] ; then |
| 151 |
eerror "The option \"${i}\" is not allowed" |
151 |
eerror "The option \"${i}\" is not allowed in pppd_${ifvar}" |
| 152 |
return 1 |
152 |
return 1 |
| 153 |
fi |
153 |
fi |
| 154 |
done |
154 |
done |
|
Lines 172-180
Link Here
|
| 172 |
[[ -f "/etc/ppp/options.${iface}" ]] \ |
172 |
[[ -f "/etc/ppp/options.${iface}" ]] \ |
| 173 |
&& opts="${opts} file /etc/ppp/options.${iface}" |
173 |
&& opts="${opts} file /etc/ppp/options.${iface}" |
| 174 |
|
174 |
|
| 175 |
# Set forced options |
175 |
# Set unit |
| 176 |
opts="unit ${unit} persist maxfail 0 ${opts}" |
176 |
opts="unit ${unit} ${opts}" |
| 177 |
|
177 |
|
|
|
178 |
# Default maxfail to 0 unless specified |
| 179 |
[[ " ${opts} " != *" maxfail "* ]] && opts="${opts} maxfail 0" |
| 180 |
|
| 181 |
# Append persist |
| 182 |
[[ " ${opts} " != *" persist "* ]] && opts="${opts} persist" |
| 183 |
|
| 178 |
# Setup connect script |
184 |
# Setup connect script |
| 179 |
local chat="chat_${ifvar}[@]" |
185 |
local chat="chat_${ifvar}[@]" |
| 180 |
if [[ -n "${!chat}" ]]; then |
186 |
if [[ -n "${!chat}" ]]; then |
