From a20f920d1d060c6d736a900b889bf91e04290416 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 30 Jan 2011 17:56:55 +0100
Subject: [PATCH] connman: put static resolv.conf in /etc no need for write
 support anymore

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/connman/config/resolv.conf | 2 ++
 packages/network/connman/init.d/21_network  | 1 -
 packages/network/connman/install            | 1 +
 packages/sysutils/busybox/install           | 3 +--
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 packages/network/connman/config/resolv.conf

diff --git a/packages/network/connman/config/resolv.conf b/packages/network/connman/config/resolv.conf
new file mode 100644
index 0000000000..a39fcf12c6
--- /dev/null
+++ b/packages/network/connman/config/resolv.conf
@@ -0,0 +1,2 @@
+# Generated by Connection Manager
+nameserver 127.0.0.1
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index a9b15c5050..ba51932e8f 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -115,6 +115,5 @@ fi
   # starting Connection manager
     progress "starting Connection manager"
 
-    touch /var/run/resolv.conf
     /usr/sbin/connmand
 )&
diff --git a/packages/network/connman/install b/packages/network/connman/install
index 957f95362e..45d241328b 100755
--- a/packages/network/connman/install
+++ b/packages/network/connman/install
@@ -27,6 +27,7 @@ add_group system 430
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/services $INSTALL/etc
+  cp $PKG_DIR/config/resolv.conf $INSTALL/etc
 
 mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/src/connman.conf $INSTALL/etc/dbus-1/system.d
diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install
index 196946e3ec..5a9826f24f 100755
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox/install
@@ -50,9 +50,8 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
   # /etc/fstab is needed by...
     touch $INSTALL/etc/fstab
 
-  # /etc/resolve.conf and /etc/hosts must be writeable
+  # /etc/hosts must be writeable
     ln -sf /var/cache/hosts $INSTALL/etc/hosts
-    ln -sf /var/cache/resolv.conf $INSTALL/etc/resolv.conf
 
   # /etc/mtab is needed by udisks etc...
     ln -sf /proc/self/mounts $INSTALL/etc/mtab