fix rootfs split partition renaming (fix by Eric L. Chen)

SVN-Revision: 8081

diff --git a/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch b/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch
index 9900cace4e0dda032ee3652a15f791726baa5c43..67f4764b7b7902409d1c51d225565c347a86dcfa 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches-2.6.22/060-rootfs_split.patch
@@ -252,8 +252,8 @@ Index: linux/drivers/mtd/mtdpart.c
 +              goto out;
 +      }
 +
 +              goto out;
 +      }
 +

-+      part->name = (unsigned char *)&part[1];

 +      memcpy(part, old, sizeof(*part));
 +      memcpy(part, old, sizeof(*part));

++      part->name = (unsigned char *)&part[1];

 +      strcpy(part->name, ROOTFS_SPLIT_NAME);
 +
 +      len = (u32) sb->bytes_used;
 +      strcpy(part->name, ROOTFS_SPLIT_NAME);
 +
 +      len = (u32) sb->bytes_used;

diff --git a/target/linux/generic-2.6/patches/060-rootfs_split.patch b/target/linux/generic-2.6/patches/060-rootfs_split.patch
index fe323c7d33518d8a2ff864aa7e834e33821987c3..262d3142d675d87e925ec3c9dd755fb78d5dc34b 100644 (file)
--- a/target/linux/generic-2.6/patches/060-rootfs_split.patch
+++ b/target/linux/generic-2.6/patches/060-rootfs_split.patch
@@ -253,8 +253,8 @@ Index: linux/drivers/mtd/mtdpart.c
 +              goto out;
 +      }
 +
 +              goto out;
 +      }
 +

-+      part->name = (unsigned char *)&part[1];

 +      memcpy(part, old, sizeof(*part));
 +      memcpy(part, old, sizeof(*part));

++      part->name = (unsigned char *)&part[1];

 +      strcpy(part->name, ROOTFS_SPLIT_NAME);
 +
 +      len = (u32) sb->bytes_used;
 +      strcpy(part->name, ROOTFS_SPLIT_NAME);
 +
 +      len = (u32) sb->bytes_used;