MA-7053 when I add selinux=disable in the cmdline, the board do OTA update will fail

The ota update script will set selinux label with set_metadata when do nand ota update.
The root cause is set_metadata will fail if disable selinux in recovery mode.
This patch is a workaround which will enable selinux in recovery mode,
even if have disable selinux in commandline.

Signed-off-by: zhang sanshan <b51434@freescale.com>

1 files changed, 31 insertions, 3 deletions

diff --git a/common/image-android.c b/common/image-android.c
index d56380d..78a1f32 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -78,9 +78,14 @@ int android_image_get_kernel(const struct andr_img_hdr *hdr, int verify,
 					serialnr.high,
 					serialnr.low);
 #endif
-
-	setenv("bootargs", commandline);
-
+	if (getenv("bootcmd_android_recovery")) {
+		char new_commandline[ANDR_BOOT_ARGS_SIZE];
+		char cmd_selinux[30] = "androidboot.selinux=disabled";
+		del_sub_str(commandline, cmd_selinux, new_commandline);
+		setenv("bootargs", new_commandline);
+	} else {
+		setenv("bootargs", commandline);
+	}
 	if (os_data) {
 		*os_data = (ulong)hdr;
 		*os_data += hdr->page_size;
@@ -151,3 +156,26 @@ int android_image_get_fdt(const struct andr_img_hdr *hdr,
 	return 0;
 }
 
+void del_sub_str(const char *str, const char *sub_str, char *cmdline)
+{
+	int str_len = strlen(str);
+	int sub_str_len = strlen(sub_str);
+
+	while (*str != '\0') {
+		while (*str != *sub_str && *str != '\0') {
+			*cmdline = *str;
+			str++;
+			cmdline++;
+		}
+		if (strncmp(str, sub_str, sub_str_len) != 0) {
+			*cmdline = *str;
+			str++;
+			cmdline++;
+			continue;
+		}  else {
+			str += sub_str_len;
+		}
+
+	}
+	*cmdline = '\0';
+}