diff options
| author | Mike Baker <mbm@openwrt.org> | 2005-02-28 07:04:51 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2005-02-28 07:04:51 +0000 |
| commit | 7f6278a1b8b55f48615b5f7aaba29bb6c6bec032 (patch) | |
| tree | 32c3dab11e7e00d5a34dfb62739d56cd390f409a /target | |
| parent | 3a68b1a02d11a83032720e515dd7d765ba6b98c4 (diff) | |
| download | upstream-7f6278a1b8b55f48615b5f7aaba29bb6c6bec032.tar.gz upstream-7f6278a1b8b55f48615b5f7aaba29bb6c6bec032.tar.bz2 upstream-7f6278a1b8b55f48615b5f7aaba29bb6c6bec032.zip | |
bugfixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rwxr-xr-x | target/default/target_skeleton/etc/preinit | 15 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk | 3 |
2 files changed, 10 insertions, 8 deletions
diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit index 28fe805260..30c025be29 100755 --- a/target/default/target_skeleton/etc/preinit +++ b/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/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 8dcd00f572..92dad0e57c 100644 --- a/target/jffs2/jffs2root.mk +++ b/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 \ |