summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-10 12:38:31 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-10 12:38:31 +0000
commit38c6cb915b2555f515d407333f449ba5b8193c6d (patch)
treeb5590ce1f5ad2432e63f8be2c941afda195dd6f3
parentcdd3f428a8de85c3c4f2eee9a350e382f649d662 (diff)
broadcom: rename the OpenWrt partition to rootfs_data
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7171 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/linux/brcm-2.4/base-files/default/bin/firstboot2
-rwxr-xr-xtarget/linux/brcm-2.4/base-files/default/sbin/mount_root2
-rw-r--r--target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c2
-rw-r--r--target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c2
4 files changed, 4 insertions, 4 deletions
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 c3d9a64b8..5d374371c 100755
--- 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 3ed1b5861..a9dd2764d 100755
--- 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 3176eb055..164178468 100644
--- 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 bc8d88737..774d4ad65 100644
--- 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, },
};