resolved conflicts for merge of 9f89b0e4
to master
Change-Id: Id458df96fd56830fdb35397e95a80274761ecff5
This commit is contained in:
commit
a66c32ab1d
@ -237,7 +237,7 @@ Value* FormatFn(const char* name, State* state, int argc, Expr* argv[]) {
|
||||
#ifdef USE_EXT4
|
||||
} else if (strcmp(fs_type, "ext4") == 0) {
|
||||
reset_ext4fs_info();
|
||||
int status = make_ext4fs(location, NULL, NULL, 0, 0, 0);
|
||||
int status = make_ext4fs(location, NULL, NULL, 0, 0);
|
||||
if (status != 0) {
|
||||
fprintf(stderr, "%s: make_ext4fs failed (%d) on %s",
|
||||
name, status, location);
|
||||
|
Loading…
Reference in New Issue
Block a user