aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-09-30 21:14:30 +0000
committerBill Nottingham <notting@redhat.com>2005-09-30 21:14:30 +0000
commit10aa6e9adfe56c1b21c009a9821a41c6810b4963 (patch)
treea1923d531aa120f877394dbcccc4be48df6b6e9f
parent7ebb62dcaa573c27239556e51714c33adbfaf0f7 (diff)
downloadinitscripts-10aa6e9adfe56c1b21c009a9821a41c6810b4963.tar
initscripts-10aa6e9adfe56c1b21c009a9821a41c6810b4963.tar.gz
initscripts-10aa6e9adfe56c1b21c009a9821a41c6810b4963.tar.bz2
initscripts-10aa6e9adfe56c1b21c009a9821a41c6810b4963.tar.xz
initscripts-10aa6e9adfe56c1b21c009a9821a41c6810b4963.zip
move wireless options before bridge options (#122801)
-rwxr-xr-xsysconfig/network-scripts/ifup-eth26
1 files changed, 13 insertions, 13 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 1e712b2d..5edcb6b8 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -50,6 +50,19 @@ if [ -n "${HWADDR}" ]; then
fi
fi
+# now check the real state
+is_available ${REALDEVICE} || {
+ if [ -n "$alias" ]; then
+ echo $"$alias device ${DEVICE} does not seem to be present, delaying initialization."
+ else
+ echo $"Device ${DEVICE} does not seem to be present, delaying initialization."
+ fi
+ exit 1
+}
+
+# is the device wireless? If so, configure wireless device specifics
+is_wireless_device ${DEVICE} && . ./ifup-wireless
+
if [ "${TYPE}" = "Bridge" ]; then
if [ ! -x /usr/sbin/brctl ]; then
echo $"Bridge support not available: brctl not found"
@@ -79,19 +92,6 @@ if [ -n "${BRIDGE}" -a -x /usr/sbin/brctl ]; then
exit 0
fi
-# now check the real state
-is_available ${REALDEVICE} || {
- if [ -n "$alias" ]; then
- echo $"$alias device ${DEVICE} does not seem to be present, delaying initialization."
- else
- echo $"Device ${DEVICE} does not seem to be present, delaying initialization."
- fi
- exit 1
-}
-
-# is the device wireless? If so, configure wireless device specifics
-is_wireless_device ${DEVICE} && . ./ifup-wireless
-
# slave device?
if [ "${SLAVE}" = yes -a "${ISALIAS}" = no -a "${MASTER}" != "" -a \
-x /sbin/ifenslave ]; then