From 658948cba133ecd3ce9a95cc3dfdb7e223253729 Mon Sep 17 00:00:00 2001
From: "Qin, Bo" <bqin@linx-info.com>
Date: Sun, 4 May 2014 11:16:26 +0800
Subject: [PATCH] Add set_resolv.sh to disable preconfig dns. Let configure it
 after installation.

	new file:   install_shell/set_resolv.sh
	modified:   setup.sh

Signed-off-by: Qin, Bo <bqin@linx-info.com>
---
 install_shell/set_resolv.sh | 22 ++++++++++++++++++++++
 setup.sh                    |  3 +++
 2 files changed, 25 insertions(+)
 create mode 100755 install_shell/set_resolv.sh

diff --git a/install_shell/set_resolv.sh b/install_shell/set_resolv.sh
new file mode 100755
index 0000000..14a7351
--- /dev/null
+++ b/install_shell/set_resolv.sh
@@ -0,0 +1,22 @@
+#!/bin/bash - 
+#===============================================================================
+#
+#          FILE:  set_resolv.sh
+# 
+#         USAGE:  ./set_resolv.sh 
+# 
+#   DESCRIPTION:  comment /etc/resolv.conf, to avoid xmanager 
+#		connect to gdm black screen in NanRuiJibao.
+# 
+#       OPTIONS:  ---
+#  REQUIREMENTS:  ---
+#          BUGS:  ---
+#         NOTES:  ---
+#        AUTHOR: Qin Bo (), bqin@linx-info.com
+#       COMPANY: linx-info
+#     COPYRIGHT: Copyright 2001-2014 Linx Technology Co.,Ltd.
+#       CREATED: 2014年04月29日 15时17分24秒 CST
+#      REVISION:  ---
+#===============================================================================
+
+sed -i "/^/&# /g" /etc/resolv.conf
diff --git a/setup.sh b/setup.sh
index c45237f..f6c4d45 100755
--- a/setup.sh
+++ b/setup.sh
@@ -20,6 +20,9 @@ fi
 ./set_bonding.sh
 echo "====Set Bonding..."
 
+echo "====Set resolv.conf..."
+./set_resolv.sh
+
 ./set_ssh.sh $1 $2 $3 
 echo "====Set ssh...."