projects
/
project
/
procd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
50da8a4
)
Revert "jail: do not hack /etc/resolv.conf on container rootfs"
author
Daniel Golle
<daniel@makrotopia.org>
Wed, 8 Sep 2021 00:39:18 +0000
(
01:39
+0100)
committer
Daniel Golle
<daniel@makrotopia.org>
Wed, 15 Sep 2021 20:43:43 +0000
(21:43 +0100)
This reverts commit
b0a8ea1c3fa844d1006764fae3f0d8382351313b
.
jail/jail.c
patch
|
blob
|
history
diff --git
a/jail/jail.c
b/jail/jail.c
index daae87e67e9091d0926228d3b8d3547cf613c1a2..d294d313d54f5d8e99ac697f3b0d4f03e8392442 100644
(file)
--- 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);