tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

resolve merge conflicts of adadb7d to nyc-dev-plus-aosp

Browse source 
Change-Id: I03bcd3f68f49160ccaa820b3983ca9a88adf6c57
This commit is contained in:
Jeff Vander Stoep 2016-06-01 11:46:42 -07:00
commit c1b985435f
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs_mgr/Android.mk
View file

@ -10,7 +10,8 @@ common_static_libraries := \
libcrypto_utils_static \
libcrypto_static \
libext4_utils_static \
libsquashfs_utils
libsquashfs_utils \
libselinux
include $(CLEAR_VARS)
LOCAL_CLANG := true

19
fs_mgr/fs_mgr_format.c
View file

@ -23,6 +23,11 @@
#include <errno.h>
#include <cutils/partition_utils.h>
#include <sys/mount.h>
#include <selinux/selinux.h>
#include <selinux/label.h>
#include <selinux/android.h>
#include "ext4_utils.h"
#include "ext4.h"
#include "make_ext4fs.h"
@ -47,17 +52,29 @@ static int format_ext4(char *fs_blkdev, char *fs_mnt_point)
return -1;
}
struct selabel_handle *sehandle = selinux_android_file_context_handle();
if (!sehandle) {
/* libselinux logs specific error */
ERROR("Cannot initialize android file_contexts");
close(fd);
return -1;
}
/* Format the partition using the calculated length */
reset_ext4fs_info();
info.len = (off64_t)dev_sz;
/* Use make_ext4fs_internal to avoid wiping an already-wiped partition. */
rc = make_ext4fs_internal(fd, NULL, NULL, fs_mnt_point, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL);
rc = make_ext4fs_internal(fd, NULL, NULL, fs_mnt_point, 0, 0, 0, 0, 0, 0, sehandle, 0, 0, NULL, NULL, NULL);
if (rc) {
ERROR("make_ext4fs returned %d.\n", rc);
}
close(fd);
if (sehandle) {
selabel_close(sehandle);
}
return rc;
}