diff options
| author | David Kaspar [Dee'Kej] <dkaspar@redhat.com> | 2017-03-21 17:21:53 +0100 |
|---|---|---|
| committer | Dee'Kej <deekej@linuxmail.org> | 2017-03-22 14:42:25 +0100 |
| commit | c5917b856db1e32a863fa78b54d5a7533c99577a (patch) | |
| tree | 5c37be58edf2a5a036f0d81083f398b5da9490eb /sysconfig/network-scripts/ifup-wireless | |
| parent | 9ab04edfb16c30f9bb03b1227b60cc751a692876 (diff) | |
| download | initscripts-c5917b856db1e32a863fa78b54d5a7533c99577a.tar initscripts-c5917b856db1e32a863fa78b54d5a7533c99577a.tar.gz initscripts-c5917b856db1e32a863fa78b54d5a7533c99577a.tar.bz2 initscripts-c5917b856db1e32a863fa78b54d5a7533c99577a.tar.xz initscripts-c5917b856db1e32a863fa78b54d5a7533c99577a.zip | |
9.70-sync: sysconfig/network-scripts/* updated - part 2
This commit contains a lot of whitespace changes.
Use 'git diff --ignore-all-space' to display the relevant changes.
Diffstat (limited to 'sysconfig/network-scripts/ifup-wireless')
| -rwxr-xr-x | sysconfig/network-scripts/ifup-wireless | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/sysconfig/network-scripts/ifup-wireless b/sysconfig/network-scripts/ifup-wireless index 70e84a21..702b6199 100755 --- a/sysconfig/network-scripts/ifup-wireless +++ b/sysconfig/network-scripts/ifup-wireless @@ -26,31 +26,37 @@ # Only meant to be called from ifup. -IW=iw +cd /etc/sysconfig/network-scripts +. ./network-functions + +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 [ -n "$ESSID" -a -n "$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 if [ -n "$WOWLAN" ] ; then - PHYDEVICE=phy_wireless_device $DEVICE + PHYDEVICE=$(phy_wireless_device $DEVICE) iw phy $PHYDEVICE wowlan enable ${WOWLAN} fi |