diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-01-31 00:32:37 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-01-31 00:32:37 +0000 |
commit | 688aaa098d5528b4a59dc44d5943fc18926299fe (patch) | |
tree | c52c0b3a46d9f152a9ca83cf598020ed44cd62fd /usr.sbin/makefs/makefs.h | |
parent | 62f8a13a756be9727a38be25c07d9a3c96f7e96d (diff) | |
download | src-688aaa098d5528b4a59dc44d5943fc18926299fe.tar.gz src-688aaa098d5528b4a59dc44d5943fc18926299fe.zip |
Allow contents of multiple directories to be merged to the current image.
Note this patch was submitted to NetBSD and they already adopted it.
http://mail-index.netbsd.org/source-changes/2012/01/28/msg031078.html
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=230795
Diffstat (limited to 'usr.sbin/makefs/makefs.h')
-rw-r--r-- | usr.sbin/makefs/makefs.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/makefs/makefs.h b/usr.sbin/makefs/makefs.h index 6556ec0b25c5..f6cadeb98c4f 100644 --- a/usr.sbin/makefs/makefs.h +++ b/usr.sbin/makefs/makefs.h @@ -94,6 +94,8 @@ typedef struct _fsnode { fsinode *inode; /* actual inode data */ char *symlink; /* symlink target */ char *contents; /* file to provide contents */ + const char *root; /* root path */ + char *path; /* directory name */ char *name; /* file name */ int flags; /* misc flags */ } fsnode; @@ -147,11 +149,11 @@ typedef struct { void apply_specfile(const char *, const char *, fsnode *, int); -void dump_fsnodes(const char *, fsnode *); +void dump_fsnodes(fsnode *); const char * inode_type(mode_t); fsnode * read_mtree(const char *, fsnode *); int set_option(option_t *, const char *, const char *); -fsnode * walk_dir(const char *, fsnode *); +fsnode * walk_dir(const char *, const char *, fsnode *, fsnode *); void free_fsnodes(fsnode *); void ffs_prep_opts(fsinfo_t *); |