diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-11-22 14:59:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 14:59:03 +0000 |
| commit | 512214c29530372ecb9a259eec8cb6f84e2a177c (patch) | |
| tree | f97193e9c42b86a1c08dfd9d618d0fc213d038d3 | |
| parent | d4e2d4f47999b17b95ed8b89fbfc065541141895 (diff) | |
| parent | 15da8b5df1445f2bfe01e56c1ef5cfff172d9bb8 (diff) | |
| download | genimage-512214c29530372ecb9a259eec8cb6f84e2a177c.tar.gz genimage-512214c29530372ecb9a259eec8cb6f84e2a177c.tar.xz | |
Merge pull request #82 from LeSpocky/ext4
image-ext: Pass 'features' to mke2fs
| -rw-r--r-- | image-ext2.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/image-ext2.c b/image-ext2.c index a1f53ff..76f3a43 100644 --- a/image-ext2.c +++ b/image-ext2.c @@ -71,20 +71,26 @@ static int ext2_generate_mke2fs(struct image *image) const char *label = cfg_getstr(image->imagesec, "label"); const char *root_owner = cfg_getstr(image->imagesec, "root-owner"); const char *options = "lazy_itable_init=0,lazy_journal_init=0"; + const char *features = ext->features; + if (features && features[0] == '\0') + features = NULL; if (label && label[0] == '\0') label = NULL; if (is_block_device(imageoutfile(image))) pad_file(image, NULL, 2048, 0x0, MODE_OVERWRITE); - return systemp(image, "%s%s -t %s%s -E 'root_owner=%s,%s'%s %s%s%s %s %s%s '%s' %lld", + return systemp(image, "%s%s -t %s%s -E 'root_owner=%s,%s'%s %s%s%s %s %s%s %s%s%s '%s' %lld", ext->conf_env, get_opt("mke2fs"), image->handler->type, ext->usage_type_args, root_owner, options, ext->size_features, image->empty ? "" : "-d '", image->empty ? "" : mountpath(image), image->empty ? "" : "'", extraargs, label ? "-L " : "", label ? label : "", + features ? "-O '" : "", + features ? features : "", + features ? "'" : "", imageoutfile(image), image->size / 1024); } |