ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

environment: Turn "lo" up in network-less containers.

Browse source 
This is a followup to 0f53c801b9.

* guix/scripts/environment.scm (launch-environment/container): Add call
to 'set-network-interface-up'.
* tests/guix-environment-container.sh: Add test.
This commit is contained in:
Ludovic Courtès 2020-10-04 22:40:26 +02:00
parent 5aa7d764be
commit b68d410651
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/scripts/environment.scm
View file

@ -34,6 +34,7 @@ (define-module (guix scripts environment)
#:use-module (guix scripts build) #:use-module (guix scripts build)
#:use-module (gnu build linux-container) #:use-module (gnu build linux-container)
#:use-module (gnu build accounts) #:use-module (gnu build accounts)
#:use-module ((guix build syscalls) #:select (set-network-interface-up))
#:use-module (gnu system linux-container) #:use-module (gnu system linux-container)
#:use-module (gnu system file-systems) #:use-module (gnu system file-systems)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -554,7 +555,10 @@ (define (optional-mapping->fs mapping)
;; to resolve "localhost". ;; to resolve "localhost".
(call-with-output-file "/etc/hosts" (call-with-output-file "/etc/hosts"
(lambda (port) (lambda (port)
(display "127.0.0.1 localhost\n" port)))) (display "127.0.0.1 localhost\n" port)))
;; Allow local AF_INET communications.
(set-network-interface-up "lo"))
;; For convenience, start in the user's current working ;; For convenience, start in the user's current working
;; directory or, if unmapped, the home directory. ;; directory or, if unmapped, the home directory.

11
tests/guix-environment-container.sh
View file

@ -48,6 +48,17 @@ fi
guix environment --container --ad-hoc --bootstrap guile-bootstrap \ guix environment --container --ad-hoc --bootstrap guile-bootstrap \
-- guile -c '(exit (pair? (getaddrinfo "localhost" "80")))' -- guile -c '(exit (pair? (getaddrinfo "localhost" "80")))'
# We should get ECONNREFUSED, not ENETUNREACH, which would indicate that "lo"
# is down.
guix environment --container --ad-hoc --bootstrap guile-bootstrap \
-- guile -c "(exit (= ECONNREFUSED
(catch 'system-error
(lambda ()
(let ((sock (socket AF_INET SOCK_STREAM 0)))
(connect sock AF_INET INADDR_LOOPBACK 12345)))
(lambda args
(pk 'errno (system-error-errno args))))))"
# Make sure '--preserve' is honored. # Make sure '--preserve' is honored.
result="`FOOBAR=42; export FOOBAR; guix environment -C --ad-hoc --bootstrap \ result="`FOOBAR=42; export FOOBAR; guix environment -C --ad-hoc --bootstrap \
guile-bootstrap -E ^FOO -- guile -c '(display (getenv \"FOOBAR\"))'`" guile-bootstrap -E ^FOO -- guile -c '(display (getenv \"FOOBAR\"))'`"