fix building when host and target systems are same arch

[openwrt.git] / root / bin / firstboot

diff --git a/root/bin/firstboot b/root/bin/firstboot
index 637f688..5076d1c 100755 (executable)
--- a/root/bin/firstboot
+++ b/root/bin/firstboot
@@ -1,7 +1,6 @@
 #!/bin/sh
 # $Id$
 
 #!/bin/sh
 # $Id$
 

-exec 2>/dev/null

 
 [ -f "/tmp/.firstboot" ] && {
        echo "firstboot is already running"
 
 [ -f "/tmp/.firstboot" ] && {
        echo "firstboot is already running"


@@ -12,27 +11,35 @@ touch /tmp/.firstboot
 jdev=$(mount | awk '/jffs2/ {print $3}')
 
 if [ -z "$jdev" ]; then
 jdev=$(mount | awk '/jffs2/ {print $3}')
 
 if [ -z "$jdev" ]; then

-       mtd erase OpenWrt
+       echo -n "Creating jffs2 partition... "
+       mtd erase OpenWrt >&- 

        mount -t jffs2 /dev/mtdblock/4 /jffs
        mount -t jffs2 /dev/mtdblock/4 /jffs

+       echo "done"

        cd /jffs
 else
        echo "firstboot has already been run"
        cd /jffs
 else
        echo "firstboot has already been run"

-       echo "fixing symlinks instead"
+       echo "jffs2 partition is mounted, only resetting files"

        cd $jdev
 fi
 
        cd $jdev
 fi
 

+exec 2>/dev/null
+

 mount /dev/mtdblock/2 /rom -o ro
 
 mount /dev/mtdblock/2 /rom -o ro
 

+echo -n "creating directories... "

 {
        cd /rom
        find . -type d
        cd -
 } | xargs mkdir
 {
        cd /rom
        find . -type d
        cd -
 } | xargs mkdir

+echo "done"

 
 

+echo -n "setting up symlinks... "

 for file in $(cd /rom; find *  -type f; find *  -type l;)
 do {
        ln -sf  /rom/$file $file
 } done
 for file in $(cd /rom; find *  -type f; find *  -type l;)
 do {
        ln -sf  /rom/$file $file
 } done

+echo "done"

 
 touch /tmp/resolv.conf
 ln -s /tmp/resolv.conf /etc/resolv.conf
 
 touch /tmp/resolv.conf
 ln -s /tmp/resolv.conf /etc/resolv.conf