summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle2021-09-08 00:39:18 +0000
committerDaniel Golle2021-09-15 20:43:43 +0000
commit482d1ab85fc3ced40690253062cd7f30da2eb0f9 (patch)
tree771b67197318e2cae91a1b9a4f39d9c414c3eba8
parent50da8a4a026f69ba85443ab81c7d258b540a701f (diff)
downloadprocd-482d1ab85fc3ced40690253062cd7f30da2eb0f9.tar.gz
Revert "jail: do not hack /etc/resolv.conf on container rootfs"
This reverts commit b0a8ea1c3fa844d1006764fae3f0d8382351313b.
-rw-r--r--jail/jail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/jail/jail.c b/jail/jail.c
index daae87e..d294d31 100644
--- a/jail/jail.c
+++ b/jail/jail.c
@@ -726,7 +726,7 @@ static int build_jail_fs(void)
create_dev_console(jail_root);
/* make sure /etc/resolv.conf exists if in new network namespace */
- if (!opts.extroot && opts.namespace & CLONE_NEWNET) {
+ if (opts.namespace & CLONE_NEWNET) {
char jailetc[PATH_MAX], jaillink[PATH_MAX];
snprintf(jailetc, PATH_MAX, "%s/etc", jail_root);