From 91bfec89abc9005501b26857d14bd9ba611e78b1 Mon Sep 17 00:00:00 2001
From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Mon, 25 Mar 2013 23:29:48 +0900
Subject: [PATCH] Modify method to set name server address for emulator

Change-Id: I3d88b976646c1c716e75d30c3f1535cda01cf8ab
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---
 filesystem/etc/preconf.d/emulator_ns.preinit | 6 ++++++
 filesystem/etc/profile.d/proxy_setting.sh    | 9 ---------
 packaging/system-plugin-emulator.spec        | 1 +
 3 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100755 filesystem/etc/preconf.d/emulator_ns.preinit

diff --git a/filesystem/etc/preconf.d/emulator_ns.preinit b/filesystem/etc/preconf.d/emulator_ns.preinit
new file mode 100755
index 0000000..954a183
--- /dev/null
+++ b/filesystem/etc/preconf.d/emulator_ns.preinit
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Set up DNS for emulator
+rm -rf /etc/resolv.conf
+echo "nameserver 10.0.2.3" > /etc/resolv.conf
+
diff --git a/filesystem/etc/profile.d/proxy_setting.sh b/filesystem/etc/profile.d/proxy_setting.sh
index a017ab1..19ac8dd 100755
--- a/filesystem/etc/profile.d/proxy_setting.sh
+++ b/filesystem/etc/profile.d/proxy_setting.sh
@@ -19,15 +19,6 @@ if grep -q "socks_proxy=" /proc/cmdline ; then
         echo -e "[Export environment variable: socks_proxy=${__proxy}]"
         export "socks_proxy=${__proxy}"
 fi
-if grep -q "dns1=" /proc/cmdline ; then
-        __dns1=`sed 's/^.*dns1=\([^, ]*\).*$/\1/g' /proc/cmdline`
-	rm -rf /etc/resolv.conf
-	echo "nameserver ${__dns1}" >> /etc/resolv.conf
-fi
-if grep -q "dns2=" /proc/cmdline ; then
-        __dns2=`sed 's/^.*dns2=\([^, ]*\).*$/\1/g' /proc/cmdline` 
-	echo "nameserver ${__dns2}" >> /etc/resolv.conf
-fi
 if grep -q "sdb_port=" /proc/cmdline ; then
         __sdb_port=`sed 's/^.*sdb_port=\([^, ]*\).*$/\1/g' /proc/cmdline` 
     	rm -rf /opt/home/sdb_port.txt
diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index dfc33ea..39f4d27 100644
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -102,6 +102,7 @@ touch /dev/rtc1
 /etc/inittab
 /etc/mdev.conf
 /etc/mtools.conf
+/etc/preconf.d/emulator_ns.preinit
 /etc/profile.d/proxy_setting.sh
 /etc/profile.d/sensord_setting.sh
 /etc/profile.d/simulator-opengl.sh
-- 
2.34.1