Merge remote-tracking branch 'origin/4.3/1691-swei'

IPv6 默认关闭

install_shell/set_close_ipv6.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-#jcye,2013/06/04
-
-#close inet6 ip
-export LANG=c
-ROOT_UID=0
-E_ROOT=2
-DATE=$(date +%Y%m%d)
-if [ $UID -ne $ROOT_UID ];then
-	echo "You must run this script use root ..."
-	exit $E_ROOT
-fi
-LOCAL_FILE=/etc/rc.d/rc.local
-sed -i.bak_$DATE '/disable_ipv6/d' ${LOCAL_FILE}
-echo "echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6">> ${LOCAL_FILE}

setup.sh

@@ -37,8 +37,8 @@ echo "===Set /etc/fstab==="
 #./install_tool.sh
 #echo "===instll update packages==="
 
-./set_close_ipv6.sh
-echo "===close ipv6 ip==="
+#./set_close_ipv6.sh
+#echo "===close ipv6 ip==="
 
 ./set_tcsh_encode.sh $3
 echo "====Set tcsh encode to gb18030..."