diff options
| author | Daniel Golle | 2020-11-26 01:01:14 +0000 |
|---|---|---|
| committer | Daniel Golle | 2020-11-27 01:06:09 +0000 |
| commit | 19ac9df87738a3e694ce68c716c5bc80174440f8 (patch) | |
| tree | 3e8877411854ae9293feb3adfe25b07974a339f8 | |
| parent | db5ef866497692d04f6476b08814842f0af4079f (diff) | |
| download | procd-19ac9df87738a3e694ce68c716c5bc80174440f8.tar.gz | |
jail: don't fail if can't mount-bind /etc/resolv.conf
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
| -rw-r--r-- | jail/jail.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jail/jail.c b/jail/jail.c index 34fec71..8c1b563 100644 --- a/jail/jail.c +++ b/jail/jail.c @@ -2696,13 +2696,13 @@ static void post_main(struct uloop_timeout *t) #endif if (!(opts.namespace & CLONE_NEWNET)) { - add_mount_bind("/etc/resolv.conf", 1, -1); + add_mount_bind("/etc/resolv.conf", 1, 0); } else if (opts.setns.net == -1) { char hostdir[PATH_MAX]; snprintf(hostdir, PATH_MAX, "/tmp/resolv.conf-%s.d", opts.name); mkdir_p(hostdir, 0755); - add_mount(hostdir, "/dev/resolv.conf.d", NULL, MS_BIND | MS_NOEXEC | MS_NOATIME | MS_NOSUID | MS_NODEV | MS_RDONLY, 0, NULL, -1); + add_mount(hostdir, "/dev/resolv.conf.d", NULL, MS_BIND | MS_NOEXEC | MS_NOATIME | MS_NOSUID | MS_NODEV | MS_RDONLY, 0, NULL, 0); } /* default mounts */ |