cleanup MTD option handling

[openwrt.git] / package / base-files / files / bin / firstboot

diff --git a/package/base-files/files/bin/firstboot b/package/base-files/files/bin/firstboot
index fe63d1b..8453b30 100755 (executable)
--- a/package/base-files/files/bin/firstboot
+++ b/package/base-files/files/bin/firstboot
@@ -1,5 +1,4 @@
 #!/bin/sh
 #!/bin/sh

-# $Id: firstboot 5544 2006-11-17 03:07:10Z nbd $

 . /etc/functions.sh
 
 partname="rootfs_data"
 . /etc/functions.sh
 
 partname="rootfs_data"


@@ -25,7 +24,7 @@ dupe() { # <new_root> <old_root>
                case "$file" in
                ./rom/note) ;; #nothing
                ./etc/config*|\
                case "$file" in
                ./rom/note) ;; #nothing
                ./etc/config*|\

-               ./usr/lib/ipkg/info/*) cp -af $2/$file $file;;
+               ./usr/lib/opkg/info/*) cp -af $2/$file $file;;

                *) ln -sf /rom/${file#./*} $file;;
                esac
        done
                *) ln -sf /rom/${file#./*} $file;;
                esac
        done


@@ -40,6 +39,7 @@ pivot() { # <new_root> <old_root>
        pivot_root $1 $1$2 && {
                mount -o move $2/dev /dev
                mount -o move $2/tmp /tmp
        pivot_root $1 $1$2 && {
                mount -o move $2/dev /dev
                mount -o move $2/tmp /tmp

+               mount -o move $2/sys /sys 2>&-

                mount -o move $2/jffs /jffs 2>&-
                return 0
        }
                mount -o move $2/jffs /jffs 2>&-
                return 0
        }


@@ -48,7 +48,7 @@ pivot() { # <new_root> <old_root>
 fopivot() { # <rw_root> <ro_root> <dupe?>
        root=$1
        {
 fopivot() { # <rw_root> <ro_root> <dupe?>
        root=$1
        {

-               mount -t mini_fo -o base=/,sto=$1 $1 /mnt 2>&- && root=/mnt
+               mount -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt

        } || {
                [ "$3" = "1" ] && {
                mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
        } || {
                [ "$3" = "1" ] && {
                mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1


@@ -78,13 +78,12 @@ ramoverlay() {
        }
 
        [ "$1" = "switch2jffs" ] && {
        }
 
        [ "$1" = "switch2jffs" ] && {

-               mtd erase "$partname"
+               mount "$mtdpart" /rom/jffs -t jffs2 || exit

 
                # try to avoid fs changing while copying
                mount -o remount,ro none / 2>&-
 
                # copy ramoverlay to jffs2
 
                # try to avoid fs changing while copying
                mount -o remount,ro none / 2>&-
 
                # copy ramoverlay to jffs2

-               mount "$mtdpart" /rom/jffs -t jffs2

                echo -n "copying files ... "
                cp -a /tmp/root/* /rom/jffs 2>&-
                echo "done"
                echo -n "copying files ... "
                cp -a /tmp/root/* /rom/jffs 2>&-
                echo "done"


@@ -102,8 +101,6 @@ ramoverlay() {
                # this will almost always fail
                umount /tmp/root 2>&-
 
                # this will almost always fail
                umount /tmp/root 2>&-
 

-               # fs is clean
-               jffs2root --clean

                exit 0
        }
 
                exit 0
        }