jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-wpa' of git://github.com/Gujs/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2011-06-02 22:57:19 +02:00
commit d1da859038
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
View File

@ -39,7 +39,7 @@
<setting type="sep" />
<setting id="NET_SSID" type="text" label="2151" default=""/>
<!-- <setting id="NET_HIDDEN" type="bool" label="2152" default="false" /> -->
<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|PSK|WEP" sort="yes" default="NONE" />
<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" />
<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default="" enable="!eq(-1,0)"/>
</category>

4
packages/network/connman/config/network.conf
View File

@ -67,10 +67,10 @@
# WLAN Security
# This option lets you chose the security protocol for your wireless
# network
# Options are "NONE" / "WEP" / "PSK" )
# Options are "NONE" / "WEP" / "WPA/WPA2" )
# "NONE" or left blank for an open WLAN (default)
# "WEP" for WEP protected WLAN's
# "PSK" for WPA protected WLAN's
# "WPA/WPA2" for WPA protected WLAN's
SECURITY=""
# WLAN Passphrase

4
packages/network/connman/init.d/21_network
View File

@ -64,10 +64,10 @@ fi
if [ "$NET_NETWORK" = "WLAN" -a -n "$NET_SSID" ]; then
NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
# NET_SECURITY: ( NONE / WEP / PSK )
# NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
MODE="managed_wep"
elif [ "$NET_SECURITY" = "PSK" -a -n "$NET_PASSPHRASE" ]; then
elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE" ]; then
MODE="managed_psk"
else
MODE="managed_none"