cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework creating /etc when building the derivation for a revision

Browse source 
Within an inferior. Just use the presence of open-inferior/container directly,
as this is more explicit.
This commit is contained in:
Christopher Baines 2019-06-13 22:58:15 +01:00
parent 7c75591f44
commit 6f379c7937
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -266,8 +266,10 @@
(derivation->output-path derivation)))
(define (channel->derivation-file-name store channel)
(define use-container? (defined? 'open-inferior/container))
(let ((inferior
(if (defined? 'open-inferior/container)
(if use-container?
(open-inferior/container
store
(guix-store-path store)
@ -282,13 +284,13 @@
#t
(lambda ()
;; /etc is only missing if open-inferior/container has been used
(unless (file-exists? "/etc")
;; Create /etc/pass, as %known-shorthand-profiles in (guix
;; profiles) tries to read from this file. Because the environment
;; is cleaned in build-self.scm, xdg-directory in (guix utils)
;; falls back to accessing /etc/passwd.
(when use-container?
(inferior-eval
'(begin
;; Create /etc/pass, as %known-shorthand-profiles in (guix
;; profiles) tries to read from this file. Because the environment
;; is cleaned in build-self.scm, xdg-directory in (guix utils)
;; falls back to accessing /etc/passwd.
(mkdir "/etc")
(call-with-output-file "/etc/passwd"
(lambda (port)