apply patches from erfan and luka

Linux-on-droid · Jun 6, 2024 · bbc1b92 · bbc1b92
1 parent b5be59a
commit bbc1b92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/Android.bp b/Android.bp
@@ -13,6 +13,7 @@ cc_defaults {
     include_dirs: [
         "external/lxc/src/lxc",
         "external/lxc/src",
+        "external/lxc/src/lxc/cgroups",
     ],
     shared_libs: [
         "libc",

diff --git a/src/lxc/config.h b/src/lxc/config.h
@@ -189,13 +189,13 @@
 
 #define LXCINITDIR "/system/libexec"
 
-#define LXCPATH "/data/lindroid/lxc"
+#define LXCPATH "/data/lindroid/lxc/container"
 
 #define LXCROOTFSMOUNT "/data/lindroid/lxc/rootfs"
 
 #define LXCTEMPLATECONFIG "/data/lindroid/lxc/config"
 
-#define LXCTEMPLATEDIR "/data/linfroid/lxc/templates"
+#define LXCTEMPLATEDIR "/data/lindroid/lxc/templates"
 
 #define LXC_DEFAULT_CONFIG "/system/lindroid/lxc/default.conf"
 

diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
@@ -609,18 +609,7 @@ __noreturn int lxc_container_init(int argc, char *const *argv, bool quiet)
 		exit(EXIT_FAILURE);
 	}
 
-	ret = close_range(STDERR_FILENO + 1, UINT_MAX, CLOSE_RANGE_UNSHARE);
-	if (ret) {
-		/*
-		 * Fallback to close_inherited() when the syscall is not
-		 * available or when CLOSE_RANGE_UNSHARE isn't supported.
-		 * On a regular kernel CLOSE_RANGE_UNSHARE should always be
-		 * available but openSUSE Leap 15.3 seems to have a partial
-		 * backport without CLOSE_RANGE_UNSHARE support.
-		 */
-		if (errno == ENOSYS || errno == EINVAL)
-			ret = close_inherited();
-	}
+	ret = close_inherited();
 	if (ret) {
 		fprintf(stderr, "Aborting attach to prevent leaking file descriptors into container\n");
 		exit(EXIT_FAILURE);