diff options
| author | Kenny Root <kroot@google.com> | 2012-10-16 17:44:21 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-10-16 17:44:21 -0700 |
| commit | cd74108cdac228e946ca8b6ea2ff11ab62941a6d (patch) | |
| tree | c657c4603c41f1cac92c540bd5e1eb07b4b0c9ad /updater/install.c | |
| parent | d0d4d44d344779e59ee196637bbc745d68d70677 (diff) | |
| parent | 78afed1c15989d4aa7e66094afa81cd3a6d22674 (diff) | |
| download | bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.zip bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.tar.gz bootable_recovery-cd74108cdac228e946ca8b6ea2ff11ab62941a6d.tar.bz2 | |
resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
Diffstat (limited to 'updater/install.c')
| -rw-r--r-- | updater/install.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/updater/install.c b/updater/install.c index 41f053d..1905423 100644 --- a/updater/install.c +++ b/updater/install.c @@ -78,23 +78,19 @@ Value* MountFn(const char* name, State* state, int argc, Expr* argv[]) { goto done; } -#ifdef HAVE_SELINUX char *secontext = NULL; if (sehandle) { selabel_lookup(sehandle, &secontext, mount_point, 0755); setfscreatecon(secontext); } -#endif mkdir(mount_point, 0755); -#ifdef HAVE_SELINUX if (secontext) { freecon(secontext); setfscreatecon(NULL); } -#endif if (strcmp(partition_type, "MTD") == 0) { mtd_scan_partitions(); |