diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-06-15 17:21:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-06-15 17:21:17 +0000 |
| commit | 6e5a58eb7b284defa202b8d281d97bef53dd029e (patch) | |
| tree | e927fafc128a4004807ae3197fd244bd403496b8 /openwrt/package/base-files/default/sbin | |
| parent | 44f2725829d62af2a078d3f47d712e62c4f399ef (diff) | |
| download | mtk-20170518-6e5a58eb7b284defa202b8d281d97bef53dd029e.zip mtk-20170518-6e5a58eb7b284defa202b8d281d97bef53dd029e.tar.gz mtk-20170518-6e5a58eb7b284defa202b8d281d97bef53dd029e.tar.bz2 | |
clean up handling of the root filesystem mount - remove broadcom specific junk from the generic base-files part
SVN-Revision: 3951
Diffstat (limited to 'openwrt/package/base-files/default/sbin')
| -rwxr-xr-x | openwrt/package/base-files/default/sbin/mount_root | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root index 88a836c..6c8805c 100755 --- a/openwrt/package/base-files/default/sbin/mount_root +++ b/openwrt/package/base-files/default/sbin/mount_root @@ -1,38 +1,8 @@ #!/bin/sh -is_dirty() { - grep Broadcom /proc/cpuinfo >&- || return 1 - OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))" - return $(hexdump -v /dev/mtdblock/1 -s $OFFSET -n 1 -e '"%d"') -} - size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo) -mount none /tmp -t tmpfs -o size=$size - -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 - else - . /bin/firstboot - is_dirty - [ $? != 0 ] && { - echo "switching to jffs2" - mount /dev/mtdblock/4 /jffs -t jffs2 - pivot /jffs /rom - } || { - echo "jffs2 unusable; using ramdisk" - ramoverlay - } - fi -fi - -mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 +mount none /proc -t proc +mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777 mkdir -p /dev/pts mount none /dev/pts -t devpts mount -t sysfs none /sys 2>&- +mount -o remount,rw /dev/root / |