Created
November 28, 2017 14:24
-
-
Save zhxt/e784ed2dfb77eeaa726507a14786bdc3 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 00b4e5b1598eba1b195eaef7542df7cb0e0a0853 Mon Sep 17 00:00:00 2001 | |
From: NeKit <nekit1000@gmail.com> | |
Date: Tue, 31 Oct 2017 17:47:56 +0300 | |
Subject: [PATCH 1/1] Don't report fsetxattr_failed error in map_prop_area_rw | |
This is needed to avoid "init: Failed to initialize property area" error | |
without SELinux enabled | |
Change-Id: I12138c869b393984e737a05d89483f0f994e17b7 | |
--- | |
libc/bionic/system_properties.cpp | 5 ++++- | |
1 file changed, 4 insertions(+), 1 deletion(-) | |
diff --git a/libc/bionic/system_properties.cpp b/libc/bionic/system_properties.cpp | |
index 9da5955f1..79f1f13fd 100644 | |
--- a/libc/bionic/system_properties.cpp | |
+++ b/libc/bionic/system_properties.cpp | |
@@ -252,7 +252,10 @@ static prop_area* map_prop_area_rw(const char* filename, const char* context, | |
* property separation. | |
*/ | |
if (fsetxattr_failed) { | |
- *fsetxattr_failed = true; | |
+ /* It's going to fail without SELinux. Set fsetxattr_failed to false anyway | |
+ * in Halium to avoid "init: Failed to initialize property area" error | |
+ */ | |
+ *fsetxattr_failed = false; | |
} | |
} | |
} | |
-- | |
2.12.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment