From 69c6fa0a2452ae3d8cb5df4c9a0b62fb66ef1b2c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sat, 29 Dec 2018 15:31:26 +0100 Subject: ToolsInstaller: Use chcon over restorecon restorecon probes file_contexts to get the context to be applied to the file. /sbin/.magisk does not exist in file_contexts for obvious reasons so restorecon always fails. Use chcon directly with the system_file context to allow contexts to be applied. Suggested-by: Chris Renshaw Signed-off-by: Harsh Shandilya --- app/src/main/java/com/wireguard/android/util/ToolsInstaller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java index 94e2bdc3..1317a90a 100644 --- a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java +++ b/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java @@ -123,7 +123,7 @@ public final class ToolsInstaller { script.append("touch /sbin/.core/img/wireguard/auto_mount; "); for (final String[] names : EXECUTABLES) { final File destination = new File("/sbin/.core/img/wireguard" + INSTALL_DIR, names[1]); - script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; restorecon '%s' || true; ", + script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; chcon 'u:object_r:system_file:s0' '%s' || true; ", new File(nativeLibraryDir, names[0]), destination, destination, destination)); } script.append("trap - INT TERM EXIT;"); -- cgit v1.2.3-59-g8ed1b