summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-07-17 15:34:09 +0200
committerLudovic Courtès <ludo@gnu.org>2015-07-17 15:35:57 +0200
commit68ac258b5291aee33dd11a6fd0f545f81935b633 (patch)
tree06a82503c2b3f31d81d5f3becb98fbe7ced0d0a1 /gnu
parentcc205dac76d29e3affc5630623de9591789e4411 (diff)
system: Use the CRDA udev rules.
* gnu/services/base.scm (%base-services): Add CRDA to the #:rules of 'udev-service'. * gnu/system/install.scm (installation-services): Likewise.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/base.scm4
-rw-r--r--gnu/system/install.scm5
2 files changed, 5 insertions, 4 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index e9e69ea2b83..888e446dc04 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -25,7 +25,7 @@
25 #:use-module (gnu system linux) ; 'pam-service', etc. 25 #:use-module (gnu system linux) ; 'pam-service', etc.
26 #:use-module (gnu packages admin) 26 #:use-module (gnu packages admin)
27 #:use-module ((gnu packages linux) 27 #:use-module ((gnu packages linux)
28 #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils)) 28 #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda))
29 #:use-module ((gnu packages base) 29 #:use-module ((gnu packages base)
30 #:select (canonical-package glibc)) 30 #:select (canonical-package glibc))
31 #:use-module (gnu packages package-management) 31 #:use-module (gnu packages package-management)
@@ -884,6 +884,6 @@ This is the GNU operating system, welcome!\n\n")))
884 ;; The LVM2 rules are needed as soon as LVM2 or the device-mapper is 884 ;; The LVM2 rules are needed as soon as LVM2 or the device-mapper is
885 ;; used, so enable them by default. The FUSE and ALSA rules are 885 ;; used, so enable them by default. The FUSE and ALSA rules are
886 ;; less critical, but handy. 886 ;; less critical, but handy.
887 (udev-service #:rules (list lvm2 fuse alsa-utils))))) 887 (udev-service #:rules (list lvm2 fuse alsa-utils crda)))))
888 888
889;;; base.scm ends here 889;;; base.scm ends here
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 1ebfc4bbb37..e7e5d4ae9d1 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -274,8 +274,9 @@ You have been warned. Thanks for being so brave.
274 (guix-service #:authorize-hydra-key? #t) 274 (guix-service #:authorize-hydra-key? #t)
275 275
276 ;; Start udev so that useful device nodes are available. 276 ;; Start udev so that useful device nodes are available.
277 ;; Use device-mapper rules for cryptsetup & co. 277 ;; Use device-mapper rules for cryptsetup & co; enable the CRDA for
278 (udev-service #:rules (list lvm2)) 278 ;; regulations-compliant WiFi access.
279 (udev-service #:rules (list lvm2 crda))
279 280
280 ;; Add the 'cow-store' service, which users have to start manually 281 ;; Add the 'cow-store' service, which users have to start manually
281 ;; since it takes the installation directory as an argument. 282 ;; since it takes the installation directory as an argument.