63 lines
3.0 KiB
Diff
63 lines
3.0 KiB
Diff
|
From 481712d9ee88395042f0640f272c1f87142bc0a8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Reisner <dreisner@archlinux.org>
|
||
|
|
Date: Wed, 9 Nov 2016 11:14:03 -0500
|
||
|
|
Subject: [PATCH] Revert "nspawn: try to bind mount resolved's resolv.conf
|
||
|
|
snippet into the container"
|
||
|
|
|
||
|
|
This reverts commit 3539724c26a1b2b00c4eb3c004b635a4b8647de6.
|
||
|
|
---
|
||
|
|
src/nspawn/nspawn.c | 27 ++++++++-------------------
|
||
|
|
1 file changed, 8 insertions(+), 19 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
|
||
|
|
index c8b18bc..93df7c6 100644
|
||
|
|
--- a/src/nspawn/nspawn.c
|
||
|
|
+++ b/src/nspawn/nspawn.c
|
||
|
|
@@ -1309,35 +1309,24 @@ static int setup_resolv_conf(const char *dest) {
|
||
|
|
/* Fix resolv.conf, if possible */
|
||
|
|
where = prefix_roota(dest, "/etc/resolv.conf");
|
||
|
|
|
||
|
|
- if (access("/usr/lib/systemd/resolv.conf", F_OK) >= 0) {
|
||
|
|
- /* resolved is enabled on the host. In this, case bind mount its static resolv.conf file into the
|
||
|
|
- * container, so that the container can use the host's resolver. Given that network namespacing is
|
||
|
|
- * disabled it's only natural of the container also uses the host's resolver. It also has the big
|
||
|
|
- * advantage that the container will be able to follow the host's DNS server configuration changes
|
||
|
|
- * transparently. */
|
||
|
|
-
|
||
|
|
- r = mount_verbose(LOG_WARNING, "/usr/lib/systemd/resolv.conf", where, NULL, MS_BIND, NULL);
|
||
|
|
- if (r >= 0)
|
||
|
|
- return mount_verbose(LOG_ERR, NULL, where, NULL,
|
||
|
|
- MS_BIND|MS_REMOUNT|MS_RDONLY|MS_NOSUID|MS_NODEV, NULL);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- /* If that didn't work, let's copy the file */
|
||
|
|
r = copy_file("/etc/resolv.conf", where, O_TRUNC|O_NOFOLLOW, 0644, 0);
|
||
|
|
if (r < 0) {
|
||
|
|
- /* If the file already exists as symlink, let's suppress the warning, under the assumption that
|
||
|
|
- * resolved or something similar runs inside and the symlink points there.
|
||
|
|
+ /* If the file already exists as symlink, let's
|
||
|
|
+ * suppress the warning, under the assumption that
|
||
|
|
+ * resolved or something similar runs inside and the
|
||
|
|
+ * symlink points there.
|
||
|
|
*
|
||
|
|
- * If the disk image is read-only, there's also no point in complaining.
|
||
|
|
+ * If the disk image is read-only, there's also no
|
||
|
|
+ * point in complaining.
|
||
|
|
*/
|
||
|
|
log_full_errno(IN_SET(r, -ELOOP, -EROFS) ? LOG_DEBUG : LOG_WARNING, r,
|
||
|
|
- "Failed to copy /etc/resolv.conf to %s, ignoring: %m", where);
|
||
|
|
+ "Failed to copy /etc/resolv.conf to %s: %m", where);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
r = userns_lchown(where, 0, 0);
|
||
|
|
if (r < 0)
|
||
|
|
- log_warning_errno(r, "Failed to chown /etc/resolv.conf, ignoring: %m");
|
||
|
|
+ log_warning_errno(r, "Failed to chown /etc/resolv.conf: %m");
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.10.2
|
||
|
|
|