projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix rootfs split partition renaming (fix by Eric L. Chen)
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches
/
060-rootfs_split.patch
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
ff800dc
..
262d314
100644
(file)
--- a/
target/linux/generic-2.6/patches/060-rootfs_split.patch
+++ b/
target/linux/generic-2.6/patches/060-rootfs_split.patch
@@
-2,12
+2,17
@@
Index: linux/drivers/mtd/Kconfig
===================================================================
--- linux.orig/drivers/mtd/Kconfig
+++ linux/drivers/mtd/Kconfig
===================================================================
--- linux.orig/drivers/mtd/Kconfig
+++ linux/drivers/mtd/Kconfig
-@@ -49,6 +49,1
1
@@ config MTD_PARTITIONS
+@@ -49,6 +49,1
6
@@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
-+config MTD_SPLIT_ROOTFS
-+ bool "Automatically split rootfs partition for squashfs"
++config MTD_ROOTFS_ROOT_DEV
++ bool "Automatically set 'rootfs' partition to be root filesystem"
++ depends on MTD_PARTITIONS
++ default y
++
++config MTD_ROOTFS_SPLIT
++ bool "Automatically split 'rootfs' partition for squashfs"
+ depends on MTD_PARTITIONS
+ default y
+
+ depends on MTD_PARTITIONS
+ default y
+
@@
-248,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;
This page took
0.021399 seconds
and
4
git commands to generate.