From 38c6cb915b2555f515d407333f449ba5b8193c6d Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 10 May 2007 12:38:31 +0000 Subject: [PATCH] broadcom: rename the OpenWrt partition to rootfs_data git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7171 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm-2.4/base-files/default/bin/firstboot | 2 +- target/linux/brcm-2.4/base-files/default/sbin/mount_root | 2 +- target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c | 2 +- .../linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c | 2 +- 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, }, }; -- 2.20.1