From 0ac03dde6c57ed4ce9c5c153626a93a40661bbf6 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 3 Feb 2016 11:29:49 +0100
Subject: [PATCH] kodi: use connmand-wait-online and rework service
 dependencies

---
 .../mediacenter/kodi/system.d/kodi-autostart.service     | 2 +-
 .../mediacenter/kodi/system.d/kodi-waitonnetwork.service | 9 ++++++---
 packages/mediacenter/kodi/system.d/kodi.service          | 3 ++-
 packages/mediacenter/kodi/system.d/kodi.target           | 5 +++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/mediacenter/kodi/system.d/kodi-autostart.service b/packages/mediacenter/kodi/system.d/kodi-autostart.service
index 7c20c134e1..e3fbd81454 100644
--- a/packages/mediacenter/kodi/system.d/kodi-autostart.service
+++ b/packages/mediacenter/kodi/system.d/kodi-autostart.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Kodi user autostart script
 Before=kodi.service
-After=graphical.target
+After=network-online.target graphical.target
 ConditionPathExists=/storage/.config/autostart.sh
 
 [Service]
diff --git a/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service b/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
index 39cdee46b8..9785da7fdc 100644
--- a/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
+++ b/packages/mediacenter/kodi/system.d/kodi-waitonnetwork.service
@@ -1,16 +1,19 @@
 [Unit]
 Description=Wait on network
+Requisite=connman.service
 After=connman.service
-Before=kodi-autostart.service kodi.service
+Before=network-online.target
+DefaultDependencies=no
+Conflicts=shutdown.target
 ConditionPathExists=/storage/.cache/openelec/network_wait
 
 [Service]
 Type=oneshot
 EnvironmentFile=/storage/.cache/openelec/network_wait
 ExecStartPre=/bin/sh -c 'echo "waiting on Network to come online ... (max. $WAIT_NETWORK_TIME sec.)"'
-ExecStart=/usr/bin/cm-online ${WAIT_NETWORK_TIME}
+ExecStart=/usr/sbin/connmand-wait-online --timeout=${WAIT_NETWORK_TIME}
 StandardOutput=tty
 RemainAfterExit=yes
 
 [Install]
-WantedBy=kodi.service
+WantedBy=network-online.target
diff --git a/packages/mediacenter/kodi/system.d/kodi.service b/packages/mediacenter/kodi/system.d/kodi.service
index e34b9e8fd0..0c170b15d3 100644
--- a/packages/mediacenter/kodi/system.d/kodi.service
+++ b/packages/mediacenter/kodi/system.d/kodi.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Kodi Media Center
-After=graphical.target
+After=network-online.target graphical.target
 Requires=graphical.target
+Wants=network-online.target
 
 [Service]
 Environment=DISPLAY=:0.0
diff --git a/packages/mediacenter/kodi/system.d/kodi.target b/packages/mediacenter/kodi/system.d/kodi.target
index 95dbd0ae9a..29cda1c50b 100644
--- a/packages/mediacenter/kodi/system.d/kodi.target
+++ b/packages/mediacenter/kodi/system.d/kodi.target
@@ -1,7 +1,8 @@
 [Unit]
 Description=Kodi Mediacenter Interface
-Requires=multi-user.target graphical.target
-After=graphical.target
+Requires=multi-user.target graphical.target network-online.target
+After=network-online.target graphical.target
+Wants=network-online.target
 Conflicts=rescue.target
 AllowIsolate=yes