aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2021-02-18 11:38:44 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2021-02-19 17:35:07 +0100
commitd7409bbc5e24267b275692b48116254d842d3821 (patch)
tree8fba327aa3461dac5a6924270e0a64606a6c64ee /bin
parent94269ff3c0166474c018c4973c481b2fcff00080 (diff)
fstree_from_file: Implement basic file globbing
The base path is passed to the fstree_from_file function and in turn to the individual callbacks. The line parsing function is modified to allow '*' as mode, uid and gid for specifically marked callbacks. A glob callback is added that internally uses the fstree_from_dir scanning functions in combination with a filter callback. Directory scanning flags are parsed from the extra arguments before interpreting it as a path fragment. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin')
-rw-r--r--bin/gensquashfs/mkfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/gensquashfs/mkfs.c b/bin/gensquashfs/mkfs.c
index b25d325..ac53623 100644
--- a/bin/gensquashfs/mkfs.c
+++ b/bin/gensquashfs/mkfs.c
@@ -118,7 +118,7 @@ static int read_fstree(fstree_t *fs, options_t *opt, sqfs_xattr_writer_t *xwr,
{
int ret;
- ret = fstree_from_file(fs, opt->infile);
+ ret = fstree_from_file(fs, opt->infile, opt->packdir);
if (ret == 0 && selinux_handle != NULL)
ret = relabel_tree_dfs(opt->cfg.filename, xwr,