diff options
| author | Tiago Natel de Moura <t.nateldemoura@f5.com> | 2020-10-29 20:30:53 +0000 |
|---|---|---|
| committer | Tiago Natel de Moura <t.nateldemoura@f5.com> | 2020-10-29 20:30:53 +0000 |
| commit | 0390cb3a61051dd93e206d50591aff5759cf42fc (patch) | |
| tree | d2105e88cbe4ef30a25243d7ccb07fae706c1003 /auto/modules | |
| parent | 417f5d911ddb3a46b590d89e73313856a32ff435 (diff) | |
| download | unit-0390cb3a61051dd93e206d50591aff5759cf42fc.tar.gz unit-0390cb3a61051dd93e206d50591aff5759cf42fc.tar.bz2 | |
Isolation: mounting of procfs by default when using "rootfs".
Diffstat (limited to 'auto/modules')
| -rw-r--r-- | auto/modules/java | 5 | ||||
| -rw-r--r-- | auto/modules/python | 2 | ||||
| -rw-r--r-- | auto/modules/ruby | 14 |
3 files changed, 10 insertions, 11 deletions
diff --git a/auto/modules/java b/auto/modules/java index 90b28b06..6996485c 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -326,11 +326,10 @@ cat << END > $NXT_BUILD_DIR/$NXT_JAVA_MOUNTS_HEADER static const nxt_fs_mount_t nxt_java_mounts[] = { - {(u_char *) "proc", (u_char *) "/proc", (u_char *) "proc", 0, NULL, 1}, {(u_char *) "$NXT_JAVA_LIBC_DIR", (u_char *) "$NXT_JAVA_LIBC_DIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, {(u_char *) "$NXT_JAVA_HOME", (u_char *) "$NXT_JAVA_HOME", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, }; diff --git a/auto/modules/python b/auto/modules/python index 2ab3ff7d..9be6b370 100644 --- a/auto/modules/python +++ b/auto/modules/python @@ -138,7 +138,7 @@ pyver = "python" + str(sys.version_info[0]) + "." + str(sys.version_info[1]) print("static const nxt_fs_mount_t nxt_python_mounts[] = {") -pattern = "{(u_char *) \"%s\", (u_char *) \"%s\", (u_char *) \"bind\", NXT_MS_BIND|NXT_MS_REC, NULL, 1}," +pattern = "{(u_char *) \"%s\", (u_char *) \"%s\", NXT_FS_BIND, (u_char *) \"bind\", 0, NULL, 1, 1}," base = None for p in sys.path: if len(p) > 0: diff --git a/auto/modules/ruby b/auto/modules/ruby index e0d54516..68324b44 100644 --- a/auto/modules/ruby +++ b/auto/modules/ruby @@ -156,23 +156,23 @@ cat << END > $NXT_RUBY_MOUNTS_PATH static const nxt_fs_mount_t nxt_ruby_mounts[] = { {(u_char *) "$NXT_RUBY_RUBYHDRDIR", (u_char *) "$NXT_RUBY_RUBYHDRDIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, {(u_char *) "$NXT_RUBY_ARCHHDRDIR", (u_char *) "$NXT_RUBY_ARCHHDRDIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, {(u_char *) "$NXT_RUBY_SITEDIR", (u_char *) "$NXT_RUBY_SITEDIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, {(u_char *) "$NXT_RUBY_LIBDIR", (u_char *) "$NXT_RUBY_LIBDIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, {(u_char *) "$NXT_RUBY_TOPDIR", (u_char *) "$NXT_RUBY_TOPDIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, {(u_char *) "$NXT_RUBY_PREFIXDIR", (u_char *) "$NXT_RUBY_PREFIXDIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL, 1}, + NXT_FS_BIND, (u_char *) "bind", 0, NULL, 1, 1}, END for path in `echo $NXT_RUBY_GEMPATH | tr ':' '\n'`; do $echo "{(u_char *) \"$path\", (u_char *) \"$path\"," >> $NXT_RUBY_MOUNTS_PATH - $echo "(u_char *) \"bind\", NXT_MS_BIND | NXT_MS_REC, NULL, 1}," >> $NXT_RUBY_MOUNTS_PATH + $echo "NXT_FS_BIND, (u_char *) \"bind\", 0, NULL, 1, 1}," >> $NXT_RUBY_MOUNTS_PATH done $echo "};" >> $NXT_RUBY_MOUNTS_PATH |