From: Mike Baker Date: Tue, 28 Feb 2006 07:46:15 +0000 (+0000) Subject: cleanup X-Git-Tag: whiterussian_rc5~104 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=09e839a41622fd5bb6d6d92b4bf017780202336c;p=openwrt%2Fsvn-archive%2Fopenwrt.git cleanup SVN-Revision: 3285 --- diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root index 3707920ed4..8fddce7e25 100755 --- a/openwrt/package/base-files/default/sbin/mount_root +++ b/openwrt/package/base-files/default/sbin/mount_root @@ -16,19 +16,15 @@ if [ "$1" != "failsafe" -a "$(nvram get no_root_swap)" != 1 ]; then mount -o remount,rw /dev/root / fi else - is_dirty - if [ $? = 0 ]; then - firstboot ramoverlay >&- 2>&- - else + is_dirty + [ $? != 0 ] && { mount /dev/mtdblock/4 /jffs pivot_root /jffs /jffs/rom && { mount none /proc -t proc umount /rom/proc mount -o move /rom/dev /dev - } || { - firstboot ramoverlay } - fi + } || firstboot ramoverlay fi fi