services: Add udev-rule procedure.

* gnu/services/base.scm (udev-rule): New procedure.
(kvm-udev-rule): Rewrite as variable in terms of udev-rule.
This commit is contained in:
Ricardo Wurmus 2015-11-18 21:58:53 +01:00
parent c3c61a781c
commit 80e6f37e30
1 changed files with 17 additions and 13 deletions

View File

@ -57,6 +57,7 @@
udev-configuration-rules udev-configuration-rules
udev-service-type udev-service-type
udev-service udev-service
udev-rule
mingetty-configuration mingetty-configuration
mingetty-configuration? mingetty-configuration?
@ -949,12 +950,9 @@ item of @var{packages}."
#:modules '((guix build union) #:modules '((guix build union)
(guix build utils)))) (guix build utils))))
(define* (kvm-udev-rule) (define (udev-rule file-name contents)
"Return a directory with a udev rule that changes the group of "Return a directory with a udev rule file FILE-NAME containing CONTENTS."
@file{/dev/kvm} to \"kvm\" and makes it #o660." (computed-file file-name
;; Apparently QEMU-KVM used to ship this rule, but now we have to add it by
;; ourselves.
(computed-file "kvm-udev-rules"
#~(begin #~(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
@ -963,20 +961,26 @@ item of @var{packages}."
(mkdir-p rules.d) (mkdir-p rules.d)
(call-with-output-file (call-with-output-file
(string-append rules.d "/90-kvm.rules") (string-append rules.d "/" #$file-name)
(lambda (port) (lambda (port)
;; Build users are part of the "kvm" group, so we (display #$contents port))))
;; can fearlessly make /dev/kvm 660 (see
;; <http://bugs.gnu.org/18994>, for background.)
(display "\
KERNEL==\"kvm\", GROUP=\"kvm\", MODE=\"0660\"\n" port))))
#:modules '((guix build utils)))) #:modules '((guix build utils))))
(define kvm-udev-rule
;; Return a directory with a udev rule that changes the group of /dev/kvm to
;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule,
;; but now we have to add it by ourselves.
;; Build users are part of the "kvm" group, so we can fearlessly make
;; /dev/kvm 660 (see <http://bugs.gnu.org/18994>, for background.)
(udev-rule "90-kvm.rules"
"KERNEL==\"kvm\", GROUP=\"kvm\", MODE=\"0660\"\n"))
(define udev-dmd-service (define udev-dmd-service
;; Return a <dmd-service> for UDEV with RULES. ;; Return a <dmd-service> for UDEV with RULES.
(match-lambda (match-lambda
(($ <udev-configuration> udev rules) (($ <udev-configuration> udev rules)
(let* ((rules (udev-rules-union (cons* udev (kvm-udev-rule) rules))) (let* ((rules (udev-rules-union (cons* udev kvm-udev-rule rules)))
(udev.conf (computed-file "udev.conf" (udev.conf (computed-file "udev.conf"
#~(call-with-output-file #$output #~(call-with-output-file #$output
(lambda (port) (lambda (port)