Changeset aab9e07 in freewrt

Timestamp:

Jul 22, 2006, 8:50:05 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

374cdc5

Parents:

bee7cba

Message:

simplify. fix squashfs images, we only support overlay filesystem at the moment, I will add ramfs as another firmware type later

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@375 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/base-files/default

Files:

• bin/firstboot (modified) (2 diffs)
• sbin/mount_root (modified) (3 diffs)

package/base-files/default/bin/firstboot

@@ -52 +52 @@
 fopivot() { # <rw_root> <ro_root> <dupe?>
         root=$1
-    {
-      mount -t mini_fo -o base=/,sto=$1 $1 /mnt 2>&- && root=/mnt
-    } || {
-      [ "$3" = "1" ] && mount -o bind $1 $1 && dupe $1 $rom
-    }
-    pivot $root $2
+        mount -t mini_fo -o base=/,sto=$1 $1 /mnt 2>&- && root=/mnt
+        pivot $root $2
 }
 
@@ -73 +69 @@
         }
 
-        [ "$1" = "switch2jffs" ] && {
-                mtd erase data
-                mount -o remount,ro none / # try to avoid fs changing while copying
-                mount -o bind / /mnt
-                mount /dev/mtdblock/4 /rom/jffs -t jffs2
-                echo -n "copying files ... "
-                cp -a /mnt/* /rom/jffs
-                umount /mnt
-                echo "done"
-                pivot /rom /mnt
-                mount -o move /mnt /tmp/root
-                pivot /jffs /rom
-                jffs2root --clean
-                exit 0
-        }
-
         # script run manually
         [ \! -z "$jffs" ] && {

package/base-files/default/sbin/mount_root

@@ -1 +1 @@
 #!/bin/sh
-is_dirty() {
-        grep Broadcom /proc/cpuinfo >&- || return 1
-        OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))"
-        return $(hexdump -v /dev/mtdblock/1 -s $OFFSET -n 1 -e '"%d"')
-}
 
 size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
@@ -21 +16 @@
         else
                 . /bin/firstboot
-                is_dirty 
-                [ $? != 0 ] && {
-                        echo "switching to jffs2"
-                        mount /dev/mtdblock/4 /jffs -t jffs2
-                        fopivot /jffs /rom
-                } || {
-                        echo "jffs2 unusable; using ramdisk"
-                        ramoverlay
-                }
+                echo "switching to overlay filesystem"
+                mount /dev/mtdblock/4 /jffs -t jffs2
+                fopivot /jffs /rom
         fi
 fi
@@ -36 +25 @@
 mkdir -p /dev/pts
 mount none /dev/pts -t devpts
-mount -t sysfs none /sys 2>&-