From 3eb60d771b50f4cf7c4e0d4cf1d60cd557c290a4 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 23 Jun 2006 20:22:54 +0000 Subject: [PATCH] nuke jffs2root --move from init scripts git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4063 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/brcm-2.4/sbin/mount_root | 8 +------- package/base-files/brcm-2.6/sbin/mount_root | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/package/base-files/brcm-2.4/sbin/mount_root b/package/base-files/brcm-2.4/sbin/mount_root index 88a836c80..8edac7854 100755 --- a/package/base-files/brcm-2.4/sbin/mount_root +++ b/package/base-files/brcm-2.4/sbin/mount_root @@ -12,12 +12,7 @@ if [ "$1" != "failsafe" ]; then mtd unlock linux mount | grep jffs2 >&- if [ $? = 0 ] ; then - if [ $(cat /proc/mtd | wc -l) = 6 ]; then - mtd erase OpenWrt - jffs2root --move - else - mount -o remount,rw /dev/root / - fi + mount -o remount,rw /dev/root / else . /bin/firstboot is_dirty @@ -35,4 +30,3 @@ fi mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 mkdir -p /dev/pts mount none /dev/pts -t devpts -mount -t sysfs none /sys 2>&- diff --git a/package/base-files/brcm-2.6/sbin/mount_root b/package/base-files/brcm-2.6/sbin/mount_root index 88a836c80..a3ada5890 100755 --- a/package/base-files/brcm-2.6/sbin/mount_root +++ b/package/base-files/brcm-2.6/sbin/mount_root @@ -12,12 +12,7 @@ if [ "$1" != "failsafe" ]; then mtd unlock linux mount | grep jffs2 >&- if [ $? = 0 ] ; then - if [ $(cat /proc/mtd | wc -l) = 6 ]; then - mtd erase OpenWrt - jffs2root --move - else - mount -o remount,rw /dev/root / - fi + mount -o remount,rw /dev/root / else . /bin/firstboot is_dirty -- 2.35.1