connman: use our new options dialog

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-01-23 00:39:12 +01:00
parent 73a81881ed
commit 17d59bdac7
2 changed files with 15 additions and 6 deletions

View File

@ -27,8 +27,22 @@
# WLAN: (WPA2): SSID, NAME, PASSPHRASE, tech: wifi mode: _managed_psk
# WLAN: (WEP): SSID, NAME, PASSPHRASE, tect: wifi mode: _managed_wep
[ -f $HOME/.config/network.conf ] && . $HOME/.config/network.conf
OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
if [ -f "$OPENELEC_SETTINGS" ]; then
HOSTNAME=`grep NET_HOSTNAME $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
NETWORK=`grep NET_NETWORK $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
IFACE=`grep NET_IFACE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
IPADDRESS=`grep NET_IPADDRESS $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
GATEWAY=`grep NET_GATEWAY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
NAMESERVER=`grep NET_NAMESERVER $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
SSID=`grep NET_SSID $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
SECURITY=`grep NET_SECURITY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
PASSPHRASE=`grep NET_PASSPHRASE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
fi
[ -z "$HOSTNAME" ] && HOSTNAME="openelec"
[ -z "$IFACE" ] && IFACE="eth0"
# setup hostname
progress "Setup hostname"
@ -53,7 +67,6 @@
# NETWORK: ( LAN / WLAN )
usleep 2000000 # TODO: wait on udev to load all drivers
[ -z "$IFACE" ] && IFACE="eth0"
[ -f /sys/class/net/$IFACE/address ] && \
IFACE=`cat /sys/class/net/$IFACE/address | sed 's/://g'`

View File

@ -31,14 +31,10 @@ mkdir -p $INSTALL/etc
mkdir -p $INSTALL/etc/dbus-1/system.d
cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d
#mkdir -p $INSTALL/usr/lib/connman/plugins
# cp $PKG_BUILD/plugins/.libs/*.so $INSTALL/usr/lib/connman/plugins
mkdir -p $INSTALL/usr/sbin
cp -P $PKG_BUILD/src/connmand $INSTALL/usr/sbin
mkdir -p $INSTALL/usr/config
cp $PKG_DIR/config/network.conf $INSTALL/usr/config
cp $PKG_DIR/config/hosts.conf $INSTALL/usr/config
if [ "$DEVTOOLS" = yes ]; then