03/05: mapped-devices: Use 'cryptsetup-static' in 'luks-device-mapping'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit b7d408ec1b591853b4a2fc209e577d60b147e03b
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 23 20:50:41 2016 +0100

    mapped-devices: Use 'cryptsetup-static' in 'luks-device-mapping'.
    
    * gnu/system/mapped-devices.scm (open-luks-device): Use
    CRYPTSETUP-STATIC instead of CRYPTSETUP.  Use 'file-append'.
    (close-luks-device): Likewise.
---
 gnu/system/mapped-devices.scm |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
index e44f269..8ab861b 100644
--- a/gnu/system/mapped-devices.scm
+++ b/gnu/system/mapped-devices.scm
@@ -23,7 +23,7 @@
   #:use-module (guix modules)
   #:use-module (gnu services)
   #:use-module (gnu services shepherd)
-  #:autoload   (gnu packages cryptsetup) (cryptsetup)
+  #:autoload   (gnu packages cryptsetup) (cryptsetup-static)
   #:autoload   (gnu packages linux) (mdadm-static)
   #:use-module (srfi srfi-1)
   #:use-module (ice-9 match)
@@ -104,7 +104,9 @@
                      ((gnu build file-systems)
                       #:select (find-partition-by-luks-uuid)))
 
-        (zero? (system* (string-append #$cryptsetup "/sbin/cryptsetup")
+        ;; Use 'cryptsetup-static', not 'cryptsetup', to avoid pulling the
+        ;; whole world inside the initrd (for when we're in an initrd).
+        (zero? (system* #$(file-append cryptsetup-static "/sbin/cryptsetup")
                         "open" "--type" "luks"
 
                         ;; Note: We cannot use the "UUID=source" syntax here
@@ -120,7 +122,7 @@
 
 (define (close-luks-device source target)
   "Return a gexp that closes TARGET, a LUKS device."
-  #~(zero? (system* (string-append #$cryptsetup "/sbin/cryptsetup")
+  #~(zero? (system* #$(file-append cryptsetup-static "/sbin/cryptsetup")
                     "close" #$target)))
 
 (define luks-device-mapping