bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: guix: Populate /etc/subgid so guix-daemon can map the “kvm” GID.

Browse source 
* gnu/services/base.scm (guix-activation): Add a line for ‘guix-daemon’
in /etc/subgid.
(guix-shepherd-services): Add /run/privileged/bin to ‘PATH’.

Change-Id: Ic103d86986ce2ace194b0a4296a00278bf0617eb
This commit is contained in:
Ludovic Courtès 2025-06-06 13:40:50 +02:00
parent 84c60c3c3b
commit 69710d1d3a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/services/base.scm
View file

@ -2275,10 +2275,14 @@ guix-daemon have the right ownership."))
;; Make 'tar' and 'gzip' available so
;; that 'guix perform-download' can use
;; them when downloading from Software
;; Heritage via '(guix swh)'.
;; Heritage via '(guix swh)'. Last,
;; /run/privileged/bin is needed for
;; 'newgidmap', used by the unprivileged
;; daemon.
(string-append "PATH="
#$(file-append tar "/bin") ":"
#$(file-append gzip "/bin")))
#$(file-append gzip "/bin") ":"
"/run/privileged/bin"))
(if proxy
(list (string-append "http_proxy=" proxy)
(string-append "https_proxy=" proxy))
@ -2383,7 +2387,24 @@ guix-daemon have the right ownership."))
#$(if (null? (guix-configuration-build-machines config))
#~#f
(guix-machines-files-installation
#~(list #$@(guix-configuration-build-machines config)))))))
#~(list #$@(guix-configuration-build-machines config))))
#$(and (not (guix-configuration-privileged? config))
;; Augment /etc/subgid so that the "kvm" group can be mapped in
;; the build user namespace. If a line is already present,
;; assume it's correct.
#~(let ((port (open-file "/etc/subgid" "w+"))
(kvm (false-if-exception (getgrnam "kvm"))))
(when kvm
(let loop ()
(let ((line ((@ (ice-9 rdelim) read-line) port)))
(cond ((eof-object? line)
(format port "guix-daemon:~a:1~%"
(group:gid kvm)))
((string-prefix? "guix-daemon:" line)
#t)
(else (loop))))))
(close-port port))))))
(define-record-type* <guix-extension>
guix-extension make-guix-extension