Fix bridge some more, remove superflous warning from vewarn and error when no interface correctly
This commit is contained in:
parent
fb2f0495a6
commit
f05ac25185
@ -38,17 +38,17 @@ bridge_pre_start() {
|
||||
eend 1
|
||||
return 1
|
||||
fi
|
||||
|
||||
eval set -- ${opts}
|
||||
for x in "$@" ; do
|
||||
case " ${x} " in
|
||||
*" ${IFACE} "*) ;;
|
||||
*) x="${x} ${IFACE}" ;;
|
||||
esac
|
||||
brctl ${x}
|
||||
done
|
||||
fi
|
||||
|
||||
eval $(_get_array "brctl_${IFVAR}")
|
||||
for x in "$@" ; do
|
||||
set -- ${x}
|
||||
x=$1
|
||||
shift
|
||||
set -- "${x}" "${IFACE}" "$@"
|
||||
brctl "$@"
|
||||
done
|
||||
|
||||
if [ -n "${ports}" ] ; then
|
||||
einfo "Adding ports to ${IFACE}"
|
||||
eindent
|
||||
@ -66,7 +66,7 @@ bridge_pre_start() {
|
||||
done
|
||||
eoutdent
|
||||
fi
|
||||
)
|
||||
) || return 1
|
||||
|
||||
# Bring up the bridge
|
||||
_up
|
||||
|
@ -394,6 +394,12 @@ start() {
|
||||
fi
|
||||
done
|
||||
|
||||
if ! _exists ; then
|
||||
eerror "ERROR: interface ${IFACE} does not exist"
|
||||
eerror "Ensure that you have loaded the correct kernel module for your hardware"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! _wait_for_carrier ; then
|
||||
if service_started devd ; then
|
||||
ewarn "no carrier, but devd will start us when we have one"
|
||||
|
@ -861,7 +861,6 @@ int ewarnv (const char *fmt, ...)
|
||||
retval += printf ("\n");
|
||||
}
|
||||
va_end (ap);
|
||||
retval += printf ("\n");
|
||||
|
||||
return (retval);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user