diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-02-28 07:04:51 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-02-28 07:04:51 +0000 |
| commit | bec201651bd011a9f7bb56e82ab8eca554ba9d6a (patch) | |
| tree | f88eb18c1f691dddede7c925e5294689cf94f9ce /openwrt/target | |
| parent | c5e45e2e383ba669b6c8b1ff93145577182aeafa (diff) | |
bugfixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target')
| -rwxr-xr-x | openwrt/target/default/target_skeleton/etc/preinit | 15 | ||||
| -rw-r--r-- | openwrt/target/jffs2/jffs2root.mk | 3 |
2 files changed, 10 insertions, 8 deletions
diff --git a/openwrt/target/default/target_skeleton/etc/preinit b/openwrt/target/default/target_skeleton/etc/preinit index 28fe80526..30c025be2 100755 --- a/openwrt/target/default/target_skeleton/etc/preinit +++ b/openwrt/target/default/target_skeleton/etc/preinit @@ -1,5 +1,6 @@ #!/bin/sh mount none /proc -t proc +mount none /tmp -t ramfs insmod diag echo 0x01 > /proc/sys/diag sleep 1 @@ -7,14 +8,16 @@ if [ $(cat /proc/sys/reset) = 1 ] ; then export FAILSAFE=true while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done & else - mount | grep jffs2 1>&- || { + mount | grep jffs2 >&- + if [ $? = 0 ] && [ $(cat /proc/mtd | wc -l) = 6 ] ; then + jffs2root --move && reboot + else mtd unlock mtd4 mount -t jffs2 /dev/mtdblock/4 /jffs pivot_root /jffs /jffs/rom - } - mount none /dev -t devfs - mount none /proc -t proc - umount rom/proc + mount none /dev -t devfs + mount none /proc -t proc + umount rom/proc + fi fi -mount none /tmp -t ramfs exec /sbin/init diff --git a/openwrt/target/jffs2/jffs2root.mk b/openwrt/target/jffs2/jffs2root.mk index 8dcd00f57..92dad0e57 100644 --- a/openwrt/target/jffs2/jffs2root.mk +++ b/openwrt/target/jffs2/jffs2root.mk @@ -29,8 +29,7 @@ mtd: $(MKFS_JFFS2) ############################################################# jffs2root: mtd - #-@find $(TARGET_DIR)/lib -type f -name \*.so\* | xargs $(STRIP) --strip-unneeded 2>/dev/null || true; - -@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true; + -@find $(TARGET_DIR) -type f -perm +111 | xargs $(SSTRIP) 2>/dev/null || true; @rm -rf $(TARGET_DIR)/usr/man @rm -rf $(TARGET_DIR)/usr/info $(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \ |