diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-05-12 14:00:46 -0400 |
|---|---|---|
| committer | Petr Lautrbach <plautrba@redhat.com> | 2011-08-15 10:20:53 +0200 |
| commit | 26da54e38428c7edec4da17cd39e22989803b41f (patch) | |
| tree | 84247b5fb931f7e8cecff0b43bb2fb771bf283af /rc.d | |
| parent | 7625e7606e133da1c0a1c10c1cc4508c5d3cac1f (diff) | |
| download | initscripts-26da54e38428c7edec4da17cd39e22989803b41f.tar initscripts-26da54e38428c7edec4da17cd39e22989803b41f.tar.gz initscripts-26da54e38428c7edec4da17cd39e22989803b41f.tar.bz2 initscripts-26da54e38428c7edec4da17cd39e22989803b41f.tar.xz initscripts-26da54e38428c7edec4da17cd39e22989803b41f.zip | |
VLAN, etc. interfaces can be slaves; check for being a slave first. (#703475)
Conflicts:
rc.d/init.d/network
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 89be5d8a..76ea3c61 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -84,6 +84,10 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi + if [ "$SLAVE" = "yes" ]; then + continue + fi + if [ "$TYPE" = "xDSL" ]; then xdslinterfaces="$xdslinterfaces $i" continue @@ -99,10 +103,6 @@ case "$1" in continue fi - if [ "$SLAVE" = "yes" ]; then - continue - fi - if LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then # this loads the module, to preserve ordering is_available $i |