From 2cd032b8240cdbf526fa6685a18ca6753cced28e Mon Sep 17 00:00:00 2001
From: "Xu, Shunxuan" <sxxu@linx-info.com>
Date: Mon, 4 Aug 2014 13:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=20=20=20=20fix=20bug=201960:=20=20=20=20=20?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=A1=AC?=
 =?UTF-8?q?=E7=9B=98=E5=AE=89=E8=A3=85=E7=9A=84=E8=87=AA=E5=8A=A8=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9C=89?=
 =?UTF-8?q?=E5=88=99=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=89=E8=A3=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	modified:   main/begin-install
---
 main/begin-install | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/main/begin-install b/main/begin-install
index 7ccc8be..2fe2a98 100755
--- a/main/begin-install
+++ b/main/begin-install
@@ -13,6 +13,13 @@ work_as_net_inst_server(){
 #instmode=`cat /proc/cmdline | sed 's/.*instmode=\([^ ]*\).*/\1/'`
 source /usr/lib/new_install/text/get_instmode.sh
 
+#检查是否存在硬盘安装的自动安装配置文件，有则根据配置文件自动安装。
+if [ -s /hdautoconf/autoinstall.xml ] ; then
+    mkdir -vp /var/install/
+    cp /hdautoconf/autoinstall.xml /var/install/install.xml
+    cd /usr/lib/new_install/text
+    /usr/bin/python ../interface/ri_install.py
+fi
 if [ $instmode = 'Auto' ];then
     mkdir -pv /var/install/
     cp /usr/lib/new_install/xml/install.xml /var/install/install.xml