domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add sysupgrade script for config preserving system upgrades. only implemented for x86-2.6 at the moment, but can be ported to other platforms easily

Browse Source 
SVN-Revision: 8456
This commit is contained in:
Felix Fietkau
2007-08-21 18:23:57 +00:00
parent ba05b57573
commit 1e38527a52
6 changed files with 284 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/mtd/src/jffs2.c
View File

@@ -147,7 +147,7 @@ static void add_file(char *name, int parent)
else
fname = name;
inode = add_dirent(name, IFTODT(S_IFREG), parent);
inode = add_dirent(fname, IFTODT(S_IFREG), parent);
memset(&ri, 0, sizeof(ri));
ri.magic = JFFS2_MAGIC_BITMASK;
ri.nodetype = JFFS2_NODETYPE_INODE;
@@ -223,6 +223,9 @@ int mtd_write_jffs2(char *mtd, char *filename, char *dir)
goto done;
}
if (!*dir)
target_ino = 1;
/* parse the structure of the jffs2 first
* locate the directory that the file is going to be placed in */
for(;;) {
@@ -253,7 +256,7 @@ int mtd_write_jffs2(char *mtd, char *filename, char *dir)
struct jffs2_raw_dirent *de = (struct jffs2_raw_dirent *) node;
/* is this the right directory name and is it a subdirectory of / */
if ((de->pino == 1) && !strncmp(de->name, dir, de->nsize))
if (*dir && (de->pino == 1) && !strncmp(de->name, dir, de->nsize))
target_ino = de->ino;
/* store the last inode and version numbers for adding extra files */

2
package/mtd/src/mtd.c
View File

@@ -52,7 +52,7 @@
#define DEBUG
#define JFFS2_DEFAULT_DIR "tmp"
#define JFFS2_DEFAULT_DIR "" /* directory name without /, empty means root dir */
#define SYSTYPE_UNKNOWN 0
#define SYSTYPE_BROADCOM 1