Merge pull request #3189 from chewitt/custom_connman

connman: allow user editable main.conf
This commit is contained in:
Stephan Raue 2014-07-07 22:56:32 +02:00
commit f1e74d2ebb
2 changed files with 8 additions and 2 deletions

View File

@ -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

View File

@ -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