Merge branch 'master' of https://github.com/oe-alliance/ofgwrite

ofgwrite.c

@@ -51,7 +51,7 @@ char rootfs_mount_point[1000];
 enum RootfsTypeEnum rootfs_type;
 int stop_neutrino_needed = 1;
 
-const char ofgwrite_version[] = "4.6.2";
+const char ofgwrite_version[] = "4.6.3";
 
 struct struct_mountlist
 {
@@ -210,7 +210,7 @@ int read_args(int argc, char *argv[])
 				flash_kernel = 1;
 				if (optarg)
 				{
-					if ((!strncmp(optarg, "mtd", 3)) || (!strncmp(optarg, "mmcblk", 6)) || (!strncmp(optarg, "sd", 2)))
+					if ((!strncmp(optarg, "mtd", 3)) || (!strncmp(optarg, "mmcblk", 6)) || (!strncmp(optarg, "sd", 2)) || (!strncmp(optarg, "boot", 4)))
 					{
 						my_printf("Flashing kernel with arg %s\n", optarg);
 						strcpy(kernel_device_arg, optarg);
@@ -224,7 +224,7 @@ int read_args(int argc, char *argv[])
 				flash_rootfs = 1;
 				if (optarg)
 				{
-					if ((!strncmp(optarg, "mtd", 3)) || (!strncmp(optarg, "mmcblk", 6)) || (!strncmp(optarg, "sd", 2)))
+					if ((!strncmp(optarg, "mtd", 3)) || (!strncmp(optarg, "mmcblk", 6)) || (!strncmp(optarg, "sd", 2)) || (!strncmp(optarg, "dreambox-rootfs", 15)))
 					{
 						my_printf("Flashing rootfs with arg %s\n", optarg);
 						strcpy(rootfs_device_arg, optarg);
@@ -396,8 +396,7 @@ int read_mtd_file()
 /* //NI
 					if ((strcmp(name, "\"rootfs\"") == 0
 						|| strcmp(name, "\"rootfs2\"") == 0
-						|| strcmp(name, "\"dreambox-rootfs\"") == 0
-						|| strcmp(name, "\"root\"") == 0))
+						|| strcmp(name, "\"dreambox-rootfs\"") == 0))
 */
 					if ((strcmp(name, "\"rootfs\"") == 0))
 					{