aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson@vistahigherlearning.com>2016-03-31 15:43:18 -0400
committerDavid Thompson <dthompson@vistahigherlearning.com>2016-04-07 11:48:31 -0400
commitfe463dbcf7093746af541f85af4081c766e0cbed (patch)
tree11760accf32c2ab12ca54fc8d8eb1617e215946b
parent5eabbc3e9089caebf74e7ce3d924b3f239d8c010 (diff)
downloadpatches-fe463dbcf7093746af541f85af4081c766e0cbed.tar
patches-fe463dbcf7093746af541f85af4081c766e0cbed.tar.gz
environment: container: Work around read-only /etc/resolv.conf issue.
* guix/scripts/environment.scm (launch-environment/container): Mount /etc/resolv.conf as a writable file.
-rw-r--r--guix/scripts/environment.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 0ec2c5d3cb..d4c09ef54c 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -406,7 +406,15 @@ host file systems to mount inside the container."
(file-system-mapping
(source file)
(target file)
- (writable? #f))))
+ ;; XXX: On some GNU/Linux
+ ;; systems, /etc/resolv.conf is a
+ ;; symlink to a file in a tmpfs
+ ;; which, for an unknown reason,
+ ;; cannot be bind mounted
+ ;; read-only within the
+ ;; container.
+ (writable?
+ (string=? "/etc/resolv.conf")))))
%network-configuration-files)
'())
;; Mappings for the union closure of all inputs.