From df33ffadd29ed02d87e87515626b673eac67f735 Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Thu, 9 Jul 2015 09:50:31 -0700 Subject: fs_config: replace getenv('OUT') by new fs_config parameter Using a getenv('OUT') in such a deep down function is a wrong design choice. Replacing with explicit parameter that may be NULL in case device specific files can be accessed from /. Since TARGET_COPY_OUT_SYSTEM may be defined to something different than system we also ensure that we use a path relative to TARGET_OUT to compute path to fs_config_* files. Bug: 21989305 Bug: 22048934 Change-Id: Id91bc183b29beac7379d1117ad83bd3346e6897b Signed-off-by: Thierry Strudel --- fs_mgr/fs_mgr_format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs_mgr') diff --git a/fs_mgr/fs_mgr_format.c b/fs_mgr/fs_mgr_format.c index 95c6a74..c73045d 100644 --- a/fs_mgr/fs_mgr_format.c +++ b/fs_mgr/fs_mgr_format.c @@ -52,7 +52,7 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point) info.len = ((off64_t)nr_sec * 512); /* Use make_ext4fs_internal to avoid wiping an already-wiped partition. */ - rc = make_ext4fs_internal(fd, NULL, fs_mnt_point, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + rc = make_ext4fs_internal(fd, NULL, NULL, fs_mnt_point, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL); if (rc) { ERROR("make_ext4fs returned %d.\n", rc); } -- cgit v1.1