X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=root%2Fbin%2Ffirstboot;fp=root%2Fbin%2Ffirstboot;h=637f68896e295c864722dac837ac07a508900547;hp=b484e1a8189b3c006d50afa45be7f621b4039f63;hb=7eeac1a313a0b0a3d908643c2b0a5541e6548979;hpb=21f62106aecb34bb3873a5b7d25344388ccefb7a;ds=sidebyside

diff --git a/root/bin/firstboot b/root/bin/firstboot
index b484e1a818..637f68896e 100755
--- a/root/bin/firstboot
+++ b/root/bin/firstboot
@@ -3,18 +3,26 @@
 
 exec 2>/dev/null
 
-umount /jffs 
-if [ -z "$(mount | grep jffs2)" ]; then
+[ -f "/tmp/.firstboot" ] && {
+	echo "firstboot is already running"
+	return
+}
+touch /tmp/.firstboot
+
+jdev=$(mount | awk '/jffs2/ {print $3}')
+
+if [ -z "$jdev" ]; then
 	mtd erase OpenWrt
 	mount -t jffs2 /dev/mtdblock/4 /jffs
-	mount /dev/mtdblock/2 /rom -o ro
 	cd /jffs
 else
 	echo "firstboot has already been run"
 	echo "fixing symlinks instead"
-	cd /
+	cd $jdev
 fi
 
+mount /dev/mtdblock/2 /rom -o ro
+
 {
 	cd /rom
 	find . -type d