Skip to content

Commit

Permalink
Merge pull request #251 from ian-abbott/mke2fs-quote-label
Browse files Browse the repository at this point in the history
image-ext2: use single quotes around label for mke2fs
  • Loading branch information
michaelolbrich authored Jun 21, 2024
2 parents 6d217c0 + 4301c34 commit b7d3e49
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions image-ext2.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,16 @@ static int ext2_generate_mke2fs(struct image *image)
if (ret < 0)
return ret;

return systemp(image, "%s%s -t %s%s -I 256 -E 'root_owner=%s,%s'%s %s%s%s %s %s%s %s%s%s '%s' %lldk",
return systemp(image, "%s%s -t %s%s -I 256 -E 'root_owner=%s,%s'%s %s%s%s %s %s%s%s %s%s%s '%s' %lldk",
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 : "",
extraargs,
label ? "-L '" : "",
label ? label : "",
label ? "'" : "",
features ? "-O '" : "",
features ? features : "",
features ? "'" : "",
Expand Down

0 comments on commit b7d3e49

Please sign in to comment.