amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: qemu-binfmt: Extend guix-daemon with extra chroot directories.

Browse source 
Fixes <https://bugs.gnu.org/20239>.

* gnu/services/virtualization.scm (<qemu-binfmt-configuration>)[guix-support?]:
New field.
(qemu-binfmt-guix-chroot): New procedure.
(qemu-binfmt-service-type)[extensions]: Add GUIX-SERVICE-TYPE.
* doc/guix.texi (Virtualization Services): Document 'guix-support?'.
(Additional Build Options): Mention binfmt_misc and offloading under
'--system'.
This commit is contained in:
Ludovic Courtès 2018-01-09 16:48:35 +01:00
parent 88554b5d05
commit 71b98b9de9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 64 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gnu/services/virtualization.scm
View file

@ -662,7 +662,9 @@ potential infinite waits blocking libvirt."))
(qemu qemu-binfmt-configuration-qemu
(default qemu))
(platforms qemu-binfmt-configuration-platforms
(default '()))) ;safest default
(default '())) ;safest default
(guix-support? qemu-binfmt-configuration-guix-support?
(default #f)))
(define (qemu-platform->binfmt qemu platform)
"Return a gexp that evaluates to a binfmt string for PLATFORM, using the
@ -724,6 +726,19 @@ given QEMU package."
'#$(map qemu-platform-name platforms))
#f)))))))
(define qemu-binfmt-guix-chroot
(match-lambda
;; Add QEMU and its dependencies to the guix-daemon chroot so that our
;; binfmt_misc handlers work in the chroot (otherwise 'execve' would fail
;; with ENOENT.)
;;
;; The 'F' flag of binfmt_misc is meant to address this problem by loading
;; the interpreter upfront rather than lazily, but apparently that is
;; insufficient (perhaps it loads the 'qemu-ARCH' binary upfront but looks
;; up its dependencies lazily?).
(($ <qemu-binfmt-configuration> qemu platforms guix?)
(if guix? (list qemu) '()))))
(define qemu-binfmt-service-type
;; TODO: Make a separate binfmt_misc service out of this?
(service-type (name 'qemu-binfmt)
@ -732,7 +747,9 @@ given QEMU package."
(const
(list %binary-format-file-system)))
(service-extension shepherd-root-service-type
qemu-binfmt-shepherd-services)))
qemu-binfmt-shepherd-services)
(service-extension guix-service-type
qemu-binfmt-guix-chroot)))
(default-value (qemu-binfmt-configuration))
(description
"This service supports transparent emulation of binaries