From f8ee3637ab64aed930280f850f65ee0de9ef371c Mon Sep 17 00:00:00 2001
From: "Wei,Shuai" <swei@linx-info.com>
Date: Thu, 28 Aug 2014 14:10:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=09=E4=BF=AE=E5=A4=8Dbug2012=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E8=BD=AF=E4=BB=B6=E5=8C=85=EF=BC=8C=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9B=AE=E5=BD=95=E5=86=B2=E7=AA=81=E5=8D=B4=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20=09?=
 =?UTF-8?q?=E5=B0=86pkgadd=20-f=E6=94=B9=E4=B8=BApkgadd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	modified:   operation/finish_install/exec_install_lib_32.sh
	modified:   operation/install_pkg.sh

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
---
 .../finish_install/exec_install_lib_32.sh      | 18 +++++++++++++-----
 operation/install_pkg.sh                       |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/operation/finish_install/exec_install_lib_32.sh b/operation/finish_install/exec_install_lib_32.sh
index 07fdba6..5fcfd53 100644
--- a/operation/finish_install/exec_install_lib_32.sh
+++ b/operation/finish_install/exec_install_lib_32.sh
@@ -2,19 +2,27 @@
 
 # install lib 32 pkgs scripts
 #
+INSTALL_LOG_DIR="/var/log/installer/"
+LOG="$INSTALL_LOG_DIR/install_lib_32.log"
+
 lib_32_pkg_dir="/pkg_lib_i686"
 
+if [ -e $INSTALL_LOG_DIR ];then
+	mkdir -p $INSTALL_LOG_DIR
+fi
+
 for pkg in  $(ls ${lib_32_pkg_dir})
 do
     pkgname=$(echo $pkg |cut -d'#' -f1)
     if [ $pkgname = 'pango_i686_lib' -o $pkgname = 'gtk2_i686_lib' ];then
 	continue
     fi
-    pkgadd -f ${lib_32_pkg_dir}/$pkg
+	echo "install ${pkg_name}..." 1>>$LOG 2>&1
+    pkgadd ${lib_32_pkg_dir}/$pkg 1>>$LOG 2>&1
 done
 
-pkgadd -f ${lib_32_pkg_dir}/pango_i686_lib#*
+echo "install pango_i686_lib..." 1>>$LOG 2>&1
+pkgadd ${lib_32_pkg_dir}/pango_i686_lib#* 1>>$LOG 2>&1
 
-pkgadd -f ${lib_32_pkg_dir}/gtk2_i686_lib#*
-
-echo -e "Install 32-lib successfully !"
+echo "install gtk2_i686_lib..." 1>>$LOG 2>&1
+pkgadd ${lib_32_pkg_dir}/gtk2_i686_lib#* 1>>$LOG 2>&1
diff --git a/operation/install_pkg.sh b/operation/install_pkg.sh
index 60ad5aa..155ab3d 100755
--- a/operation/install_pkg.sh
+++ b/operation/install_pkg.sh
@@ -104,7 +104,7 @@ add_pkg ()
 
 	local pkg_src=$1
 
-	pkgadd -f -r $TARGET $pkg_src 1>>$DEV_LOG 2>&1
+	pkgadd -r $TARGET $pkg_src 1>>$DEV_LOG 2>&1
 }
 
 install_pkg ()

From f97252f528d6ad77b5029ef2f2c32f13f8727cd7 Mon Sep 17 00:00:00 2001
From: "Wei,Shuai" <swei@linx-info.com>
Date: Thu, 28 Aug 2014 14:14:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=09=E7=BB=86=E5=BE=AE=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	modified:   operation/finish_install/exec_install_lib_32.sh

	Signed-off-by: Wei,Shuai <swei@linx-info.com>
---
 operation/finish_install/exec_install_lib_32.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/operation/finish_install/exec_install_lib_32.sh b/operation/finish_install/exec_install_lib_32.sh
index 5fcfd53..3ebda2b 100644
--- a/operation/finish_install/exec_install_lib_32.sh
+++ b/operation/finish_install/exec_install_lib_32.sh
@@ -7,7 +7,7 @@ LOG="$INSTALL_LOG_DIR/install_lib_32.log"
 
 lib_32_pkg_dir="/pkg_lib_i686"
 
-if [ -e $INSTALL_LOG_DIR ];then
+if [ ! -e $INSTALL_LOG_DIR ];then
 	mkdir -p $INSTALL_LOG_DIR
 fi