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:
0ee73b2
)
jail: do not hack /etc/resolv.conf on container rootfs
author
Daniel Golle
<daniel@makrotopia.org>
Mon, 12 Jul 2021 23:59:32 +0000
(
00:59
+0100)
committer
Daniel Golle
<daniel@makrotopia.org>
Thu, 15 Jul 2021 17:07:51 +0000
(18:07 +0100)
While useful for slim containers, this violates OCI spec and breaks
containers like pihole.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
jail/jail.c
patch
|
blob
|
history
diff --git
a/jail/jail.c
b/jail/jail.c
index c350be280fdfe3d4d6ced2beeacd41aa68a1cd91..cf3127a1715d59678d492981f41fd4f1072b3312 100644
(file)
--- a/
jail/jail.c
+++ b/
jail/jail.c
@@
-689,7
+689,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.namespace & CLONE_NEWNET) {
+ if (
!opts.extroot &&
opts.namespace & CLONE_NEWNET) {
char jailetc[PATH_MAX], jaillink[PATH_MAX];
snprintf(jailetc, PATH_MAX, "%s/etc", jail_root);