broadcom: rename the OpenWrt partition to rootfs_data

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7171 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/brcm-2.4/base-files/default/bin/firstboot b/target/linux/brcm-2.4/base-files/default/bin/firstboot
index c3d9a64b87f05b7c49a8632d0895b679976f7e3a..5d374371c0acf05e85504a502746c7ba608954e7 100755 (executable)
--- a/target/linux/brcm-2.4/base-files/default/bin/firstboot
+++ b/target/linux/brcm-2.4/base-files/default/bin/firstboot
@@ -2,7 +2,7 @@
 # $Id$
 . /etc/functions.sh
 
-partname="OpenWrt"
+partname="rootfs_data"
 mtdpart="$(find_mtd_part $partname)"
 
 rom=$(awk '/squashfs/ {print $2}' /proc/mounts)

diff --git a/target/linux/brcm-2.4/base-files/default/sbin/mount_root b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
index 3ed1b58616ad5dba661424da68140169e905ed3e..a9dd2764dda2a09fe4fbdc1a79c9d8668009d707 100755 (executable)
--- a/target/linux/brcm-2.4/base-files/default/sbin/mount_root
+++ b/target/linux/brcm-2.4/base-files/default/sbin/mount_root
@@ -19,7 +19,7 @@ if [ "$1" != "failsafe" ]; then
                is_dirty 
                [ $? != 0 ] && {
                        echo "switching to jffs2"
-                       mount $(find_mtd_part OpenWrt) /jffs -t jffs2
+                       mount $(find_mtd_part rootfs_data) /jffs -t jffs2
                        fopivot /jffs /rom
                } || {
                        echo "jffs2 not ready yet; using ramdisk"

diff --git a/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c b/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c
index 3176eb0552f65c87361277972e1ecd55066f58af..1641784681919bd49591f3c755a09237e4f4ce5b 100644 (file)
--- a/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c
+++ b/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c
@@ -158,7 +158,7 @@ static struct mtd_partition bcm947xx_parts[] = {
        { name: "linux", offset: 0, size: 0, },
        { name: "rootfs", offset: 0, size: 0, },
        { name: "nvram", offset: 0, size: 0, },
-       { name: "OpenWrt", offset: 0, size: 0, },
+       { name: "rootfs_data", offset: 0, size: 0, },
        { name: NULL, },
 };
 

diff --git a/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c b/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
index bc8d887377c93820213c5fcfad7e8fd338d6acea..774d4ad6594661003912dfa364779d10d97be5e5 100644 (file)
--- a/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
+++ b/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
@@ -95,7 +95,7 @@ static struct mtd_partition bcm947xx_parts[] = {
        { name: "linux", offset: 0, size: 0, },
        { name: "rootfs", offset: 0, size: 0, },
        { name: "nvram", offset: 0, size: 0, },
-       { name: "OpenWrt", offset: 0, size: 0, },
+       { name: "rootfs_data", offset: 0, size: 0, },
        { name: NULL, },
 };