From 96543426898ebd6d7158a88ce4c42184a7d01169 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 12 May 2011 14:00:46 -0400 Subject: VLAN, etc. interfaces can be slaves; check for being a slave first. (#703475) --- rc.d/init.d/network | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rc.d') diff --git a/rc.d/init.d/network b/rc.d/init.d/network index ac30b8f3..b3dbe7a6 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -98,6 +98,10 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi + if [ "$SLAVE" = "yes" ]; then + continue + fi + if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then vpninterfaces="$vpninterfaces $i" continue @@ -121,10 +125,6 @@ case "$1" in continue fi - if [ "$SLAVE" = "yes" ]; then - continue - fi - if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then # this loads the module, to preserve ordering is_available $i -- cgit v1.2.1