X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/dead6fde5190cfcf868e6b46299879c9eb72a886..7bfbd75115d54d77df68ff865162f69283e7c7fe:/package/openwrt/jffs2root.c?ds=sidebyside

diff --git a/package/openwrt/jffs2root.c b/package/openwrt/jffs2root.c
index 77519a4a6..140c8a6e0 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>
@@ -73,6 +73,8 @@ int main(int argc, char **argv)
     int fd;
     unsigned long len;
     struct trx_header *ptr;
+    unsigned offset;
+	
     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))
@@ -81,19 +83,22 @@ int main(int argc, char **argv)
 	exit(-1);
     }
 
+    /* treat last partition as rootfs offset */
+    offset = ptr->offsets[2] ? : ptr->offsets[1];
+	
     if (argc > 1 && !strcmp(argv[1],"--move")) {
-      if (ptr->offsets[1] >= ptr->len) {
+      if (offset >= ptr->len) {
         printf("Partition already moved outside trx\n");
 #if 0
-      } else if (ptr->offsets[1] & 0x0001ffff) {
+      } else if (offset & 0x0001ffff) {
         printf("Partition does not start on a block boundary\n");
 #endif
       } else {
 	init_crc32();
 	//bzero((void *)((int)ptr + ptr->len), (size_t)(len - ptr->len));
-        ptr->len = ptr->offsets[1];
+        ptr->len = offset;
         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 {
@@ -108,6 +113,7 @@ int main(int argc, char **argv)
     }
 
 
-    munmap((void *) ptr, sizeof(struct trx_header));
+    munmap((void *) ptr, len);
+    close (fd);
     return 0;
 }