Lines 45-51
Link Here
|
45 |
if [ -n "${interface_order}" ]; then |
45 |
if [ -n "${interface_order}" ]; then |
46 |
interface_order="lo lo[0-9]* ${interface_order} *" |
46 |
interface_order="lo lo[0-9]* ${interface_order} *" |
47 |
fi |
47 |
fi |
|
|
48 |
if [ -z "${dynamic_order}" ]; then |
49 |
dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*" |
50 |
fi |
51 |
dynamic_order="lo* lo[0-9]* ${dynamic_order}" |
48 |
|
52 |
|
|
|
53 |
|
49 |
error_exit() |
54 |
error_exit() |
50 |
{ |
55 |
{ |
51 |
echo "$*" >&2 |
56 |
echo "$*" >&2 |
Lines 245-259
Link Here
|
245 |
# If we don't have a list then prefer lo, metrics, tunnels, ppp |
250 |
# If we don't have a list then prefer lo, metrics, tunnels, ppp |
246 |
# and then anything else. |
251 |
# and then anything else. |
247 |
if [ -z "${LIST}" ]; then |
252 |
if [ -z "${LIST}" ]; then |
248 |
LIST="lo lo[0-9]* " |
253 |
cd "${IFACEDIR}" |
|
|
254 |
for DYN in ${dynamic_order}; do |
255 |
if [ -e "${DYN}" -a ! -e "${METRICDIR}/"*" ${DYN}" ] |
256 |
then |
257 |
LIST="${LIST} ${DYN}" |
258 |
fi |
259 |
done |
249 |
if [ -d "${METRICDIR}" ]; then |
260 |
if [ -d "${METRICDIR}" ]; then |
250 |
cd "${METRICDIR}" |
261 |
cd "${METRICDIR}" |
251 |
for METRIC in *; do |
262 |
for METRIC in *; do |
252 |
LIST="${LIST} ${METRIC#* }" |
263 |
LIST="${LIST} ${METRIC#* }" |
253 |
done |
264 |
done |
254 |
fi |
265 |
fi |
255 |
LIST="${LIST} tap[0-9]* tun[0-9]* vpn vpn[0-9]*" |
266 |
LIST="${LIST} *" |
256 |
LIST="${LIST} ppp[0-9]* ippp[0-9]* *" |
|
|
257 |
fi |
267 |
fi |
258 |
|
268 |
|
259 |
RETVAL=0 |
269 |
RETVAL=0 |
Lines 387-398
Link Here
|
387 |
rm -f "${METRICDIR}/"*" ${IFACE}" |
397 |
rm -f "${METRICDIR}/"*" ${IFACE}" |
388 |
[ ! -d "${METRICDIR}" ] && mkdir "${METRICDIR}" |
398 |
[ ! -d "${METRICDIR}" ] && mkdir "${METRICDIR}" |
389 |
rm -f "${METRICDIR}/"*" ${IFACE}" |
399 |
rm -f "${METRICDIR}/"*" ${IFACE}" |
390 |
# Pad metric to 6 characters, so 5 is less than 10 |
400 |
if [ -n "${IF_METRIC}" ]; then |
391 |
# All interfaces will get a default metric of 0 |
401 |
# Pad metric to 6 characters, so 5 is less than 10 |
392 |
while [ ${#IF_METRIC} -le 6 ]; do |
402 |
# All interfaces will get a default metric of 0 |
393 |
IF_METRIC="0${IF_METRIC}" |
403 |
while [ ${#IF_METRIC} -le 6 ]; do |
394 |
done |
404 |
IF_METRIC="0${IF_METRIC}" |
395 |
echo " " >"${METRICDIR}/${IF_METRIC} ${IFACE}" |
405 |
done |
|
|
406 |
echo " " >"${METRICDIR}/${IF_METRIC} ${IFACE}" |
407 |
fi |
396 |
case "${IF_PRIVATE}" in |
408 |
case "${IF_PRIVATE}" in |
397 |
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) |
409 |
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) |
398 |
if [ ! -d "${PRIVATEDIR}" ]; then |
410 |
if [ ! -d "${PRIVATEDIR}" ]; then |