From 26da54e38428c7edec4da17cd39e22989803b41f Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 12 May 2011 14:00:46 -0400
Subject: VLAN, etc. interfaces can be slaves; check for being a slave first.
 (#703475)

Conflicts:

	rc.d/init.d/network
---
 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 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
-- 
cgit v1.2.1