From c369d5f4910f62cc83a4de38b5907ddc1c973132 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 21 Jul 2013 19:22:13 +0300
Subject: [PATCH 1/5] connman: init: pre-configure lo, don't count on
 connman...

---
 packages/network/connman/init.d/21_network | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index 71ce6d9709..47f5b99844 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -28,6 +28,7 @@ fi
 
 # starting loopback device
   progress "starting loopback device"
+  ifconfig lo 127.0.0.1 netmask 255.0.0.0
   ifconfig lo up
 
 # creating initial settings file

From ed5c3506675719d323cd80e4784355887dd60db8 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 21 Jul 2013 19:40:22 +0300
Subject: [PATCH 2/5] connman: add option to force wait_for_inet_addr even if
 not configured in oe addon

---
 .../network/connman/profile.d/21-connman.conf | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/network/connman/profile.d/21-connman.conf b/packages/network/connman/profile.d/21-connman.conf
index 262ea9bb50..78ec568298 100644
--- a/packages/network/connman/profile.d/21-connman.conf
+++ b/packages/network/connman/profile.d/21-connman.conf
@@ -21,16 +21,16 @@
 wait_for_inet_addr () {
   if [ -f $CONFIG_CACHE/openelec/network_wait ]; then
     . $CONFIG_CACHE/openelec/network_wait
+  fi
 
-    if [ "$WAIT_NETWORK" = "true" ] ; then
-      progress "Wait for network"
-      [ -z "$WAIT_NETWORK_TIME" ] && WAIT_NETWORK_TIME=10
-      LOOP_COUNT=$((WAIT_NETWORK_TIME * 5))
-      for i in $(seq 1 $LOOP_COUNT) ; do
-        cnt=$(ifconfig | sed -e '/inet addr:/!d' -e '/127.0.0.1/d' |wc -l)
-        [ $cnt -gt 0 ] && break
-        usleep 200000
-      done
-    fi
+  if [ "$WAIT_NETWORK" = "true" -o "$1" == "force" ] ; then
+    progress "Wait for network"
+    [ -z "$WAIT_NETWORK_TIME" ] && WAIT_NETWORK_TIME=10
+    LOOP_COUNT=$((WAIT_NETWORK_TIME * 5))
+    for i in $(seq 1 $LOOP_COUNT) ; do
+      cnt=$(ifconfig | sed -e '/inet addr:/!d' -e '/127.0.0.1/d' |wc -l)
+      [ $cnt -gt 0 ] && break
+      usleep 200000
+    done
   fi
 }

From 9b551d8b29f6293b600762fb3f4ff85fe4702be7 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 21 Jul 2013 19:40:57 +0300
Subject: [PATCH 3/5] samba: init: wait for network

---
 packages/network/samba/init.d/52_samba | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/network/samba/init.d/52_samba b/packages/network/samba/init.d/52_samba
index a572dbe5f2..47c8a06edb 100644
--- a/packages/network/samba/init.d/52_samba
+++ b/packages/network/samba/init.d/52_samba
@@ -34,6 +34,9 @@
 
   if [ "$SAMBA_ENABLED" = "true" ]; then
 
+    # wait for network
+    wait_for_inet_addr force
+
     progress  "Starting Samba server"
 
     SMB_USERCONF="/storage/.config/samba.conf"

From 2218deaa88cc7262ebc2aad1f751684230953836 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 21 Jul 2013 19:41:43 +0300
Subject: [PATCH 4/5] avahi: wait for network

---
 packages/network/avahi/init.d/53_avahi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi
index c3fd0247c6..1831782af0 100644
--- a/packages/network/avahi/init.d/53_avahi
+++ b/packages/network/avahi/init.d/53_avahi
@@ -27,6 +27,9 @@
   # ensure that environment is sane
   . /etc/profile
 
+  # wait for network
+  wait_for_inet_addr force
+
   progress "Starting Avahi Daemon"
 
   mkdir -p /var/run/avahi-daemon

From 4d4978878b0c53fc405d5a3d9ad08a7be9c56b8c Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 21 Jul 2013 19:59:13 +0300
Subject: [PATCH 5/5] ssh: init: nah. we don't ship own known_hosts.

---
 packages/network/openssh/init.d/51_sshd | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/network/openssh/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd
index fcea22c19a..a5dc2f9ce7 100644
--- a/packages/network/openssh/init.d/51_sshd
+++ b/packages/network/openssh/init.d/51_sshd
@@ -69,12 +69,6 @@
           chmod 600 $DSA2_KEY
       fi
 
-    # Check for predefined known hosts file
-      if [ -f /etc/ssh/known_hosts -a ! -f $HOME/.ssh/known_hosts ] ; then
-        progress "SSH: setup predefined known hosts"
-          cp /etc/ssh/known_hosts $HOME/.ssh
-      fi
-
       progress "Starting SSH Server"
         rm /var/run/sshd.pid &>/dev/null
         eval $SSHD $OPTIONS