connman: allow user editable main.conf

In recent months I have seen a number of cases where users need to
change ‘prefer ethernet’ to ‘prefer wifi’ or where users are trying to
enable tethering for ethernet or are running other daemons that add
network interfaces that should not be auto-managed by comman. All of
these require user editing of main.conf so this change moves main.conf
to /storage where it can be tweaked under-the-hood if needed.

packages/network/connman/scripts/connman-setup

@@ -22,3 +22,10 @@
     mkdir -p /storage/.cache/connman
       cp /usr/share/connman/settings /storage/.cache/connman
   fi
+
+# set variable for connman main.conf location
+  if [ -f /storage/.config/connman_main.conf ]; then
+    export CONNMAN_MAIN="--config=/storage/.config/connman_main.conf"
+  else
+    export CONNMAN_MAIN="--config=/etc/connman/main.conf"
+  fi

packages/network/connman/system.d/connman.service

@@ -11,8 +11,7 @@ Type=dbus
 BusName=net.connman
 Restart=on-failure
 EnvironmentFile=-/run/openelec/debug/connman.conf
-ExecStartPre=/usr/lib/connman/connman-setup
-ExecStart=/usr/sbin/connmand -nr $CONNMAN_DEBUG
+ExecStart=/bin/sh -c ". /usr/lib/connman/connman-setup; exec /usr/sbin/connmand -nr $CONNMAN_MAIN $CONNMAN_DEBUG"
 # send SIGKILL on stop to keep ip configuration
 KillSignal=SIGKILL
 StandardOutput=null