diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-22 14:17:40 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-22 14:17:56 +0100 |
| commit | 3cd83bf7814ac2f138c79bc58c95f95494e0b1ce (patch) | |
| tree | dcec765969f4bc85150a5bd1864d0c2969012a3f | |
| parent | a73b2264dfd89d526054e4be9926be9f50cca791 (diff) | |
| download | system_core-3cd83bf7814ac2f138c79bc58c95f95494e0b1ce.tar.gz system_core-3cd83bf7814ac2f138c79bc58c95f95494e0b1ce.tar.bz2 system_core-3cd83bf7814ac2f138c79bc58c95f95494e0b1ce.zip | |
Revert "fs_mgr: Drop the context mount option from non-selinux builds"
This reverts commit 806fc566fd4544cfcd3334aa1a992bab0f6d277c.
Revert "fs_mgr: Don't assume all fstab entries have options"
This reverts commit a73b2264dfd89d526054e4be9926be9f50cca791.
| -rw-r--r-- | fs_mgr/Android.mk | 4 | ||||
| -rw-r--r-- | fs_mgr/fs_mgr.c | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index 48b11b690..7c66f6ab0 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -3,10 +3,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -ifeq ($(HAVE_SELINUX),true) -LOCAL_CFLAGS += -DHAVE_SELINUX -endif - LOCAL_SRC_FILES:= fs_mgr.c LOCAL_C_INCLUDES := $(LOCAL_PATH)/include diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index 23682cbf1..99adb81d9 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -456,17 +456,6 @@ int fs_mgr_mount_all(char *fstab_file) } for (i = 0; fstab[i].blk_dev; i++) { -#ifndef HAVE_SELINUX - if (fstab[i].fs_options) { - char *contextpos = strstr(fstab[i].fs_options,",context="); - - /* This makes it mandatory that context is the LAST mount option */ - if (contextpos != NULL) { - *contextpos='\0'; - } - } -#endif - if (fstab[i].fs_mgr_flags & MF_WAIT) { wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT); } |