diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-06-23 20:22:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-06-23 20:22:54 +0000 |
| commit | 1f3a32108b3e36d0613194b9fd356433e515ccb3 (patch) | |
| tree | 0aa62566032fe9918e4b6c8b29368e6c4fee2369 /package/base-files | |
| parent | ed381e1042504bba69306bba181f32d3fbfec828 (diff) | |
| download | upstream-1f3a32108b3e36d0613194b9fd356433e515ccb3.tar.gz upstream-1f3a32108b3e36d0613194b9fd356433e515ccb3.tar.bz2 upstream-1f3a32108b3e36d0613194b9fd356433e515ccb3.zip | |
nuke jffs2root --move from init scripts
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4063 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/brcm-2.4/sbin/mount_root | 8 | ||||
| -rwxr-xr-x | 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 88a836c808..8edac78543 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 88a836c808..a3ada58908 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 |