From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 15 Feb 2006 18:42:53 +0000 (+0000)
Subject: fix rootfs mount after 'mtd erase OpenWrt'
X-Git-Tag: whiterussian_rc5~121
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f66285fb2f41392107822095e2580bfa604a785e;p=openwrt%2Fsvn-archive%2Fopenwrt.git

fix rootfs mount after 'mtd erase OpenWrt'

SVN-Revision: 3244
---

diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index 5f9ae37a87..3707920ed4 100755
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -21,10 +21,13 @@ if [ "$1" != "failsafe" -a "$(nvram get no_root_swap)" != 1 ]; then
 			firstboot ramoverlay >&- 2>&-
 		else
 			mount /dev/mtdblock/4 /jffs
-			pivot_root /jffs /jffs/rom
-			mount none /proc -t proc
-			umount /rom/proc
-			mount -o move /rom/dev /dev
+			pivot_root /jffs /jffs/rom && {
+				mount none /proc -t proc
+				umount /rom/proc
+				mount -o move /rom/dev /dev
+			} || {
+				firstboot ramoverlay
+			}
 		fi
 	fi
 fi