From 918a5170e64a9766b443d3a65f9b6bcf65f1e60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda@redhat.com>
Date: Wed, 19 Feb 2014 11:19:42 +0100
Subject: network: modify ifup-wireless so it doesn't call exit

https://bugzilla.redhat.com/show_bug.cgi?id=1057635
---
 sysconfig/network-scripts/ifup-wireless | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-wireless b/sysconfig/network-scripts/ifup-wireless
index 3b248cca..062b5024 100755
--- a/sysconfig/network-scripts/ifup-wireless
+++ b/sysconfig/network-scripts/ifup-wireless
@@ -26,26 +26,29 @@
 
 # Only meant to be called from ifup.
 
-IW=iw
+IW=${IW:-iw}
 
-[ "$DEVICE" -a "$MODE" ] || exit
 [ "$KEY" ] && KEYS="key d:0:$KEY"
 
 shopt -s nocasematch
 
 case "$MODE" in
 managed)
-    [ "$ESSID" ] || exit
-    $IW dev "$DEVICE" set type managed
-    $IW dev "$DEVICE" connect -w "$ESSID" $FREQ $KEYS
+    if [ "$ESSID" ]; then
+	$IW dev "$DEVICE" set type managed
+	$IW dev "$DEVICE" connect -w "$ESSID" $FREQ $KEYS
+    fi
     ;;
 ad-hoc)
-    [ "$ESSID" && "$FREQ" ] || exit
-    $IW dev "$DEVICE" set type ibss
-    $IW dev "$DEVICE" ibss join "$ESSID" "$FREQ" $KEYS
+    if [ "$ESSID" && "$FREQ" ]; then
+	$IW dev "$DEVICE" set type ibss
+	$IW dev "$DEVICE" ibss join "$ESSID" "$FREQ" $KEYS
+    fi
     ;;
 monitor)
-    [ "$FREQ" ] || exit
-    $IW dev "$DEVICE" set type monitor
-    $IW dev "$DEVICE" set freq "$FREQ"
+    if [ "$FREQ" ]; then 
+	$IW dev "$DEVICE" set type monitor
+	$IW dev "$DEVICE" set freq "$FREQ"
+    fi
+    ;;
 esac
-- 
cgit v1.2.1