diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-05-12 14:00:46 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-05-12 14:00:46 -0400 |
| commit | 96543426898ebd6d7158a88ce4c42184a7d01169 (patch) | |
| tree | 9af6b84850ff3286526bb9552f3b032c57f2e343 /rc.d | |
| parent | caca80528ead03919e6157ccd2bdffff37e2dbad (diff) | |
| download | initscripts-96543426898ebd6d7158a88ce4c42184a7d01169.tar initscripts-96543426898ebd6d7158a88ce4c42184a7d01169.tar.gz initscripts-96543426898ebd6d7158a88ce4c42184a7d01169.tar.bz2 initscripts-96543426898ebd6d7158a88ce4c42184a7d01169.tar.xz initscripts-96543426898ebd6d7158a88ce4c42184a7d01169.zip | |
VLAN, etc. interfaces can be slaves; check for being a slave first. (#703475)
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/network | 8 |
1 files changed, 4 insertions, 4 deletions
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 |