summary refs log tree commit diff
path: root/gnu/system
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-06-14 08:49:42 -0400
committerMark H Weaver <mhw@netris.org>2015-06-14 08:49:42 -0400
commitbcf2971f6ebc965aa94391b2a8d39e5005885806 (patch)
treec12187a787b934fb79d159046a4a5516e5d39f97 /gnu/system
parentec2990716005b4b41bab6b707ada0206c1655be8 (diff)
parent7871724df7218428fac53133496c474bac8c5ea8 (diff)
downloadguix-bcf2971f6ebc965aa94391b2a8d39e5005885806.tar.gz
Merge branch 'master' into core-updates
Conflicts:
	gnu/packages/commencement.scm
	gnu/packages/xml.scm
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/install.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 27d8ecdefc..e8a36b3def 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -269,7 +269,8 @@ You have been warned.  Thanks for being so brave.
           (guix-service #:authorize-hydra-key? #t)
 
           ;; Start udev so that useful device nodes are available.
-          (udev-service)
+          ;; Use device-mapper rules for cryptsetup & co.
+          (udev-service #:rules (list lvm2))
 
           ;; Add the 'cow-store' service, which users have to start manually
           ;; since it takes the installation directory as an argument.