X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f0aa43923c309c39cc61b1a932737ab87c66a029..25ea0c2afb9795e9ba7a5446af302e522c3b606f:/package/openwrt/jffs2root.c?ds=inline

diff --git a/package/openwrt/jffs2root.c b/package/openwrt/jffs2root.c
index 2ff37fdad..36b928ff4 100644
--- a/package/openwrt/jffs2root.c
+++ b/package/openwrt/jffs2root.c
@@ -3,8 +3,6 @@
  *
  * Copyright (C) 2005 Mike Baker 
  *
- * $Id$
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -19,6 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
+ * $Id$
+ *
  */
 
 #include <stdio.h>
@@ -30,6 +30,8 @@
 #include <sys/stat.h>
 #include <string.h>
 
+#include <sys/ioctl.h>
+#include <linux/mtd/mtd.h>
 
 #define FILENAME "/dev/mtdblock/1"
 
@@ -71,8 +73,10 @@ unsigned int crc32buf(char *buf, size_t len)
 int main(int argc, char **argv)
 {
     int fd;
+    struct mtd_info_user mtdInfo;
     unsigned long len;
     struct trx_header *ptr;
+	
     if (((fd = open(FILENAME, O_RDWR))  < 0)
     || ((len = lseek(fd, 0, SEEK_END)) < 0)
     || ((ptr = (struct trx_header *) mmap(0, len, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1))
@@ -80,22 +84,31 @@ int main(int argc, char **argv)
 	printf("Error reading trx info\n");
 	exit(-1);
     }
+    close (fd);
+
+    if (((fd = open("/dev/mtd/1", O_RDWR))  < 0)
+    || (ioctl(fd, MEMGETINFO, &mtdInfo))) {
+      fprintf(stderr, "Could not get MTD device info from %s\n", FILENAME);
+      close(fd);
+      exit(1);
+    }
+    close(fd);
 
     if (argc > 1 && !strcmp(argv[1],"--move")) {
-      if (ptr->offsets[1] >= ptr->len) {
+      if (ptr->offsets[2] >= ptr->len) {
         printf("Partition already moved outside trx\n");
-      } else if (ptr->offsets[1] & 0x0001ffff) {
-        printf("Partition does not start on a block boundary\n");
       } else {
 	init_crc32();
-	bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len));
-        ptr->len = ptr->offsets[1];
+	ptr->offsets[2] +=  (mtdInfo.erasesize - 1);
+	ptr->offsets[2] &= ~(mtdInfo.erasesize - 1);
+        ptr->len = ptr->offsets[2];
         ptr->crc32 = crc32buf((void *) &(ptr->flag_version), ptr->len - offsetof(struct trx_header, flag_version));
-	msync(ptr,len,MS_SYNC|MS_INVALIDATE);
+	msync(ptr,sizeof(struct trx_header),MS_SYNC|MS_INVALIDATE);
 	printf("Partition moved; please reboot\n");
       }
     } else {
       int x;
+      printf(" erase: 0x%08x\n",mtdInfo.erasesize);
       printf("=== trx ===\n");
       printf("mapped: 0x%08x\n", (unsigned)ptr);
       printf(" magic: 0x%08x\n", ptr->magic);
@@ -105,7 +118,6 @@ int main(int argc, char **argv)
 	printf(" offset[%d]: 0x%08x\n", x, ptr->offsets[x]);
     }
 
-
-    munmap((void *) ptr, sizeof(struct trx_header));
+    munmap((void *) ptr, len);
     return 0;
 }