summary refs log tree commit diff
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
parentcc205dac76d29e3affc5630623de9591789e4411 (diff)
downloadguix-68ac258b5291aee33dd11a6fd0f545f81935b633.tar.gz
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.
-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 e9e69ea2b8..888e446dc0 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -25,7 +25,7 @@
   #:use-module (gnu system linux)                 ; 'pam-service', etc.
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
-                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils))
+                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda))
   #:use-module ((gnu packages base)
                 #:select (canonical-package glibc))
   #:use-module (gnu packages package-management)
@@ -884,6 +884,6 @@ This is the GNU operating system, welcome!\n\n")))
           ;; The LVM2 rules are needed as soon as LVM2 or the device-mapper is
           ;; used, so enable them by default.  The FUSE and ALSA rules are
           ;; less critical, but handy.
-          (udev-service #:rules (list lvm2 fuse alsa-utils)))))
+          (udev-service #:rules (list lvm2 fuse alsa-utils crda)))))
 
 ;;; base.scm ends here
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 1ebfc4bbb3..e7e5d4ae9d 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -274,8 +274,9 @@ You have been warned.  Thanks for being so brave.
           (guix-service #:authorize-hydra-key? #t)
 
           ;; Start udev so that useful device nodes are available.
-          ;; Use device-mapper rules for cryptsetup & co.
-          (udev-service #:rules (list lvm2))
+          ;; Use device-mapper rules for cryptsetup & co; enable the CRDA for
+          ;; regulations-compliant WiFi access.
+          (udev-service #:rules (list lvm2 crda))
 
           ;; Add the 'cow-store' service, which users have to start manually
           ;; since it takes the installation directory as an argument.