From e6bd5e37795418e433e38d0d41ecaa269087a1fe Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 23 Jun 2006 20:22:54 +0000 Subject: [PATCH] nuke jffs2root --move from init scripts SVN-Revision: 4063 --- openwrt/package/base-files/brcm-2.4/sbin/mount_root | 8 +------- openwrt/package/base-files/brcm-2.6/sbin/mount_root | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/openwrt/package/base-files/brcm-2.4/sbin/mount_root b/openwrt/package/base-files/brcm-2.4/sbin/mount_root index 88a836c808..8edac78543 100755 --- a/openwrt/package/base-files/brcm-2.4/sbin/mount_root +++ b/openwrt/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/openwrt/package/base-files/brcm-2.6/sbin/mount_root b/openwrt/package/base-files/brcm-2.6/sbin/mount_root index 88a836c808..a3ada58908 100755 --- a/openwrt/package/base-files/brcm-2.6/sbin/mount_root +++ b/openwrt/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.30.2