From 78e5cf7f83ec7400a162d3b85f2968ca1cc7e2e1 Mon Sep 17 00:00:00 2001
From: Peng Zhihui <zhihuipeng@linx-info.com>
Date: Wed, 19 Mar 2014 11:25:43 +0800
Subject: [PATCH] Install 32 lib pkgs in finish_install step

	modified:   operation/configure_fstab.sh
	new file:   operation/finish_install/66install_lib_32.sh
	new file:   operation/finish_install/exec_install_lib_32.sh
---
 operation/configure_fstab.sh                  |  2 +-
 operation/finish_install/66install_lib_32.sh  | 33 +++++++++++++++++++
 .../finish_install/exec_install_lib_32.sh     | 20 +++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100755 operation/finish_install/66install_lib_32.sh
 create mode 100644 operation/finish_install/exec_install_lib_32.sh

diff --git a/operation/configure_fstab.sh b/operation/configure_fstab.sh
index 967758a..27d1d64 100755
--- a/operation/configure_fstab.sh
+++ b/operation/configure_fstab.sh
@@ -73,7 +73,7 @@ configure_fstab ()
 	# other device set 0.
 	case $fs_type in
 		ext2|ext3|ext4|reiserfs) 
-			[ -z "$fs_mntops" ] && fs_mntops="acl,data=writeback" 
+			[ -z "$fs_mntops" ] && fs_mntops="acl" 
 			;;
 		swap)
 			[ -z "$fs_mntops" ] && fs_mntops="defaults" 
diff --git a/operation/finish_install/66install_lib_32.sh b/operation/finish_install/66install_lib_32.sh
new file mode 100755
index 0000000..cf30a5a
--- /dev/null
+++ b/operation/finish_install/66install_lib_32.sh
@@ -0,0 +1,33 @@
+#!/bin/bash - 
+#===============================================================================
+#
+#          FILE:  install_32lib.sh
+# 
+#         USAGE:  ./install_32lib.sh 
+# 
+#   DESCRIPTION:  install lib 32 pkgs
+# 
+#       OPTIONS:  ---
+#  REQUIREMENTS:  ---
+#          BUGS:  ---
+#         NOTES:  ---
+#        AUTHOR: Peng Zhihui (), zhihuipeng@linx-info.com
+#       COMPANY: linx-info
+#     COPYRIGHT: Copyright 2001-2014 Linx Technology Co.,Ltd.
+#       CREATED: 2014年03月18日 16时17分49秒 CST
+#      REVISION:  ---
+#===============================================================================
+
+#set -o nounset                              # Treat unset variables as an error
+
+source ./functions
+
+mkdir -p $TARGET/pkg_lib_i686
+
+cp /Rocky/packages/*i686_lib#* $TARGET/pkg_lib_i686
+
+cp /usr/lib/new_install/operation/finish_install/exec_install_lib_32.sh $TARGET/opt/
+
+chmod +x $TARGET/opt/exec_install_lib_32.sh
+
+chroot $TARGET /opt/exec_install_lib_32.sh >>$LOG_FILE 2>&1 && rm -rf $TARGET/opt/exec_install_lib_32.sh  $TARGET/pkg_lib_i686
diff --git a/operation/finish_install/exec_install_lib_32.sh b/operation/finish_install/exec_install_lib_32.sh
new file mode 100644
index 0000000..07fdba6
--- /dev/null
+++ b/operation/finish_install/exec_install_lib_32.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# install lib 32 pkgs scripts
+#
+lib_32_pkg_dir="/pkg_lib_i686"
+
+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
+done
+
+pkgadd -f ${lib_32_pkg_dir}/pango_i686_lib#*
+
+pkgadd -f ${lib_32_pkg_dir}/gtk2_i686_lib#*
+
+echo -e "Install 32-lib successfully !"