summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArtem Konev <artem.konev@nginx.com>2020-09-18 11:46:15 +0100
committerArtem Konev <artem.konev@nginx.com>2020-09-18 11:46:15 +0100
commit8ee96c224a42c47d641bc41424d932bb8c76773a (patch)
treebe2eb9f72d6a6a2670673afdd5cc7d53491d0764
parentf16ae01b12e612701f44c028f188d1ded58d0358 (diff)
downloadunit-8ee96c224a42c47d641bc41424d932bb8c76773a.tar.gz
unit-8ee96c224a42c47d641bc41424d932bb8c76773a.tar.bz2
Updated racially charged language in messages and comments.
-rw-r--r--src/nxt_isolation.c6
-rw-r--r--src/nxt_unit.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nxt_isolation.c b/src/nxt_isolation.c
index 0ff63e50..ac7a37e8 100644
--- a/src/nxt_isolation.c
+++ b/src/nxt_isolation.c
@@ -740,7 +740,7 @@ nxt_isolation_pivot_root(nxt_task_t *task, const char *path)
*/
if (nxt_slow_path(mount("", "/", "", MS_SLAVE|MS_REC, "") != 0)) {
- nxt_alert(task, "failed to make / a slave mount %E", nxt_errno);
+ nxt_alert(task, "mount(\"/\", MS_SLAVE|MS_REC) failed: %E", nxt_errno);
return NXT_ERROR;
}
@@ -764,8 +764,8 @@ nxt_isolation_pivot_root(nxt_task_t *task, const char *path)
}
/*
- * Make oldroot a slave mount to avoid unmounts getting propagated to the
- * host.
+ * Demote the oldroot mount to avoid unmounts getting propagated to
+ * the host.
*/
if (nxt_slow_path(mount("", ".", "", MS_SLAVE | MS_REC, NULL) != 0)) {
nxt_alert(task, "failed to bind mount rootfs %E", nxt_errno);
diff --git a/src/nxt_unit.h b/src/nxt_unit.h
index 67244cf4..eb3c30fa 100644
--- a/src/nxt_unit.h
+++ b/src/nxt_unit.h
@@ -187,7 +187,7 @@ struct nxt_unit_read_info_s {
/*
* Initialize Unit application library with necessary callbacks and
- * ready/reply port parameters, send 'READY' response to master.
+ * ready/reply port parameters, send 'READY' response to main.
*/
nxt_unit_ctx_t *nxt_unit_init(nxt_unit_init_t *);