merge in nyc-release history after reset to master
diff --git a/Android.mk b/Android.mk
index 5cd0499..186e569 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,7 +45,7 @@
generated_sources_dir := $(local-generated-sources-dir)
my_gen := $(generated_sources_dir)/$(TARGET_ARCH)/libsyscalls.c
-# We need the quotes so the shell script treats the following as one argument.
+# We need the quotes so the shell script treat them as one argument.
my_cc := "$(lastword $(CLANG)) \
$(addprefix -isystem ,$(TARGET_C_INCLUDES)) \
$(CLANG_TARGET_GLOBAL_CFLAGS)"
diff --git a/libminijail.c b/libminijail.c
index 2164186..0806d17 100644
--- a/libminijail.c
+++ b/libminijail.c
@@ -569,7 +569,7 @@
goto error;
m->flags = flags;
- info("mount %s -> %s type '%s'", src, dest, type);
+ info("mount %s -> %s type %s", src, dest, type);
/*
* Force vfs namespacing so the mounts don't leak out into the
@@ -1344,6 +1344,9 @@
pdie("unshare(net)");
}
+ if (j->mounts_head && !(j->flags.chroot || j->flags.pivot_root))
+ die("can't bind-mount without chroot or pivot_root");
+
if (j->flags.chroot && enter_chroot(j))
pdie("chroot");
diff --git a/util.c b/util.c
index 3de8eb7..c72640a 100644
--- a/util.c
+++ b/util.c
@@ -29,7 +29,7 @@
#if defined(__x86_64__)
#if defined(__ANDROID__)
const char *log_syscalls[] = {"socket", "connect", "fcntl", "writev"};
-#else
+#elif
const char *log_syscalls[] = {"connect", "sendto"};
#endif
#elif defined(__i386__)
