Merge remote-tracking branch 'origin/4.3/1691-jgmu' into master-merge

setup.sh

@@ -19,18 +19,11 @@ fi
 ./set_network.sh
 echo "====Set Bonding..."
 
-./set_kernel.sh
-echo "====Set Kernel parameters..."
-
 ./set_ssh.sh $1 $2 $3 
 echo "====Set ssh...."
 
-./ntpd_cron_patch.sh
-echo "====Set ntp client..."
-
-
-./audit_patch.sh $1 $2 $3
-echo "====Set audit.rules ..."
+./update_time.sh
+echo "====Set update time...."
 
 ./set_fonts.sh
 echo "====add fonts===="
@@ -38,9 +31,6 @@ echo "====add fonts===="
 ./set_limits.conf.sh
 echo "====Set limits.conf===="
 
-./set_recycling-station.sh
-echo "===Set trash recycling station==="
-
 ./set_fstab.sh
 echo "===Set /etc/fstab==="
 
@@ -56,8 +46,6 @@ echo "====Set tcsh encode to gb18030..."
 ./other.sh $1 $2 $3
 echo "===Set other==="
 
-./set_linux-pam.sh
-echo "===Set pam_cracklib.so and pam_tally.so ==="
 
 cd cgroup-d5000-install
 ./install.sh $1 $2 $3