From 8752a67a19efc6bd9e77e2472ae2e348b7e980a4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 23 Jan 2011 18:36:11 +0100
Subject: [PATCH] connman: update to last option dialog changes

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/init.d/21_network | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index 1acca549ea..4cc1aa96f6 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -22,11 +22,6 @@
 #
 # runlevels: openelec, installer, textmode
 
-# LAN:  no security: no SSID, NAME:Wired, no PASSPHRASE, tech: ethernet, mode: _cable
-# WLAN: no security: SSID,    NAME,       no PASSPHRASE, tech: wifi      mode: _managed_none
-# WLAN: (WPA2):      SSID,    NAME,       PASSPHRASE,    tech: wifi      mode: _managed_psk
-# WLAN: (WEP):       SSID,    NAME,       PASSPHRASE,    tect: wifi      mode: _managed_wep
-
 OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml"
 
 if [ -f "$OPENELEC_SETTINGS" ]; then
@@ -34,15 +29,17 @@ if [ -f "$OPENELEC_SETTINGS" ]; then
   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"`
+  PREFIXLEN=`grep NET_PREFIXLEN $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"`
+  DNS1=`grep NET_DNS1 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  DNS2=`grep NET_DNS2 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
+  DNS3=`grep NET_DNS3 $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"
@@ -98,12 +95,14 @@ fi
     if [ -z "$IPADDRESS" ]; then
       echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE
     else
-      IP=`echo $IPADDRESS | cut -f1 -d/`
-      PREFIX=`echo $IPADDRESS | cut -f2 -d/`
       echo "IPv4.method=manual" >> $CONNMAN_PROFILE
-      echo "IPv4.local_address=$IP" >> $CONNMAN_PROFILE
-      [ -n "$PREFIX" ] && echo "IPv4.netmask_prefixlen=$PREFIX" >> $CONNMAN_PROFILE
+      echo "IPv4.local_address=$IPADDRESS" >> $CONNMAN_PROFILE
+      [ -n "$PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$PREFIXLEN" >> $CONNMAN_PROFILE
       [ -n "$GATEWAY" ] && echo "IPv4.gateway=$GATEWAY" >> $CONNMAN_PROFILE
+
+      [ -n "$DNS1" ] && NAMESERVER="$DNS1"
+      [ -n "$DNS2" ] && NAMESERVER="$NAMESERVER;$DNS2"
+      [ -n "$DNS3" ] && NAMESERVER="$NAMESERVER;$DNS3"
       [ -n "$NAMESERVER" ] && echo "Nameservers=$NAMESERVER;" >> $CONNMAN_PROFILE
     fi