Merge remote-tracking branch 'upstream/master' into openelec-settings

Conflicts:
	packages/network/connman/init.d/21_network

packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt

@@ -1,3 +1,6 @@
+3.0.6
+- fix configobj error n startup
+
 3.0.5
 - rebuild. configobj included
 

packages/addons/service/downloadmanager/SABnzbd-Suite/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="SABnzbd-Suite"
 PKG_VERSION="3.0"
-PKG_REV="5"
+PKG_REV="6"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.openelec.tv"

packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py

@@ -28,7 +28,6 @@ import urllib2
 import socket
 import time
 import datetime
-from configobj import ConfigObj
 
 __scriptname__ = "SABnzbd Suite"
 __author__     = "OpenELEC"
@@ -51,6 +50,9 @@ subprocess.call(['python',__start__])
 # check for launching sabnzbd
 sabNzbdLaunch = (__settings__.getSetting('SABNZBD_LAUNCH').lower() == 'true')
 
+sys.path.append(os.path.join(__cwd__, 'pylib'))
+from configobj import ConfigObj
+
 if sabNzbdLaunch:
     # SABnzbd addresses and api key
     sabNzbdAddress    = '127.0.0.1:8081'

packages/network/connman/init.d/21_network

@@ -39,7 +39,7 @@ mkdir -p /run/connman
 # starting Connection manager
   progress "starting Connection manager"
   if [ -f $HOME/.config/debug.connman ]; then
-    /usr/sbin/connmand -d > /dev/null 2>&1
+    /usr/sbin/connmand -rd > /dev/null 2>&1
   else
-    /usr/sbin/connmand > /dev/null 2>&1
+    /usr/sbin/connmand -r > /dev/null 2>&1
   fi

packages/network/connman/install

@@ -26,7 +26,7 @@ add_user system x 430 430 "service" "/var/run/connman" "/bin/sh"
 add_group system 430
 
 mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/resolv.conf $INSTALL/etc
+  ln -sf /var/cache/resolv.conf $INSTALL/etc/resolv.conf
 
 mkdir -p $INSTALL/etc/connman
   cp $PKG_DIR/config/main.conf $INSTALL/etc/connman