Merge pull request #2792 from kubiko/fix-android-hooks

Fixing hooks functionality Android where 'sh' is placed under /system

Merge pull request #2792 from kubiko/fix-android-hooks
0a0e05aa · Christian Brauner · GitHub · 6f16ac1f · ecfa5693 · 0a0e05aa
Unverified Commit 0a0e05aa authored Jan 18, 2019 by Christian Brauner Committed by GitHub Jan 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

utils.c src/lxc/utils.c +6 -1

No files found.
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -447,7 +447,12 @@ struct lxc_popen_FILE *lxc_popen(const char *command)
 		if (ret < 0)
 			_exit(EXIT_FAILURE);

-		execl("/bin/sh", "sh", "-c", command, (char *)NULL);
+		/* check if /bin/sh exist, otherwise try Android location /system/bin/sh */
+		if (file_exists("/bin/sh"))
+			execl("/bin/sh", "sh", "-c", command, (char *)NULL);
+		else
+			execl("/system/bin/sh", "sh", "-c", command, (char *)NULL);
+
 		_exit(127);
 	}