Index: /branches/rel_apv_10_4_2_107_cloud/tools/image_creator.sh
===================================================================
--- /branches/rel_apv_10_4_2_107_cloud/tools/image_creator.sh	(revision 37947)
+++ /branches/rel_apv_10_4_2_107_cloud/tools/image_creator.sh	(working copy)
@@ -208,11 +208,16 @@
         echo 'LABEL=var /var                    xfs     defaults        0 0' >> /mnt/etc/fstab.slave
         /bin/cp -f /mnt/vmlinuz-${KERNEL_VERSION} ./files/vmlinuz-${KERNEL_VERSION}
         /bin/cp -f /mnt/initramfs-${KERNEL_VERSION}.img ./files/initramfs-${KERNEL_VERSION}.img
+        /bin/cp -f /mnt/etc/shadow /mnt/etc/shadow.aws_backup
+        sed -i '/^array/d' /mnt/etc/shadow
+        sed -i '/^ansync/d' /mnt/etc/shadow
+        sed -i '/^test/d' /mnt/etc/shadow
+        sed -i 's/.*PasswordAuthentication yes/PasswordAuthentication no/g' /mnt/ca/etc/sshd_config
+        sed -i 's/.*PasswordAuthentication yes/PasswordAuthentication no/g' /mnt/etc/ssh/sshd_config
     fi
     echo "SELINUX=disabled" > /mnt/etc/selinux/config
     echo "SELINUXTYPE=targeted" >> /mnt/etc/selinux/config
     echo "AN" > /mnt/etc/hostname
-    sed -i '/^array/d' /mnt/etc/shadow
     /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/sshd.service
     /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/NetworkManager.service
     /bin/rm -f /mnt/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
@@ -255,7 +260,7 @@
         echo "SELINUXTYPE=targeted" >> /mnt/etc/selinux/config
         echo "AN" > /mnt/etc/hostname
         #delete the password of array on the image
-        sed -i '/^array/d' /mnt/etc/shadow
+        #sed -i '/^array/d' /mnt/etc/shadow
         /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/sshd.service
         /bin/rm -f /mnt/etc/systemd/system/multi-user.target.wants/NetworkManager.service
         /bin/rm -f /mnt/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
Index: /branches/rel_apv_10_4_2_107_cloud/usr/click/bin/backend/sys_tool.c
===================================================================
--- /branches/rel_apv_10_4_2_107_cloud/usr/click/bin/backend/sys_tool.c	(revision 37947)
+++ /branches/rel_apv_10_4_2_107_cloud/usr/click/bin/backend/sys_tool.c	(working copy)
@@ -2525,8 +2525,10 @@
 	rtn =  ui_load_atomic_file(full_name, CMD_NORMAL, CMD_NORMAL);
 
 	/* bug 87095 */
-	if((access(full_name, F_OK) != 0) && get_bootup_flag()) {
-		ui_adduser(ARRAY_COMPINFO_DEFAULT_USER, ARRAY_COMPINFO_DEFAULT_PASSWD, NULL);
+	if((access(full_name, F_OK) != 0) && get_bootup_flag() ) {
+		if (str_in_file("cloud_platform=aws", "/boot/loader.conf") != 0) {
+			ui_adduser(ARRAY_COMPINFO_DEFAULT_USER, ARRAY_COMPINFO_DEFAULT_PASSWD, NULL);
+		}
 	}
 
 	/* do cloud-init and enable ssh pubkey if on cloud platform*/
Index: /branches/rel_apv_10_4_2_107_cloud/usr/click/bin/backend/users.c
===================================================================
--- /branches/rel_apv_10_4_2_107_cloud/usr/click/bin/backend/users.c	(revision 37947)
+++ /branches/rel_apv_10_4_2_107_cloud/usr/click/bin/backend/users.c	(working copy)
@@ -2163,7 +2163,9 @@
 		return (0);
 	}
 
-	if (!check_cloud_env("aliyun") && !get_bootup_flag()) {
+	if (!check_cloud_env("aws")) {
+		adduser(ARRAY_COMPINFO_DEFAULT_USER, CA_GROUP);
+	} else if (!check_cloud_env("aliyun") && !get_bootup_flag()) {
 		ui_adduser_internal(ARRAY_COMPINFO_DEFAULT_USER, ARRAY_COMPINFO_DEFAULT_PASSWD, NULL, 0);
 	}
 	update_soapuser();
Index: /branches/rel_apv_10_4_2_107_cloud/usr/click/tools/click_upgrade.pl
===================================================================
--- /branches/rel_apv_10_4_2_107_cloud/usr/click/tools/click_upgrade.pl	(revision 37947)
+++ /branches/rel_apv_10_4_2_107_cloud/usr/click/tools/click_upgrade.pl	(working copy)
@@ -185,6 +185,10 @@
 sub check_fstab_aws {
 	my $is_aws = `grep "^cloud_platform=aws\$" /boot/loader.conf`;
 	if ( $is_aws ) {
+		#AWS does not allow password to login
+		if ( -e "/etc/shadow.aws_backup" ) {
+			`mv -f /etc/shadow.aws_backup /etc/shadow`;
+		}
 		#AWS does not allow two /etc/ directory
 		if ( ! -d "/caupgrade/etc" ) {
 			`mkdir -p /caupgrade/etc`;
Index: /branches/rel_apv_10_4_2_107_cloud/usr/click/tools/sysv_click
===================================================================
--- /branches/rel_apv_10_4_2_107_cloud/usr/click/tools/sysv_click	(revision 37947)
+++ /branches/rel_apv_10_4_2_107_cloud/usr/click/tools/sysv_click	(working copy)
@@ -147,7 +147,6 @@
 	# For AWS
 	if [ ! -z "${is_aws}" ]; then
 		insmod /ca/kmod/ena.ko
-		modprobe ena
 		modprobe nvme
 	fi