diff options
| author | Leo Famulari <leo@famulari.name> | 2016-11-26 16:21:47 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-11-26 16:21:47 -0500 |
| commit | a282cdae107c8aec512b563f25dd411183ef2830 (patch) | |
| tree | 3359e7101ba120cb6d2dbd156327edd727bcc01a /gnu/system/mapped-devices.scm | |
| parent | 3ad8cb4163deee77882ee4bded83a548752b896f (diff) | |
| parent | cd65d600ac6e8701ef9c54f5d09a45cd6c149949 (diff) | |
| download | patches-a282cdae107c8aec512b563f25dd411183ef2830.tar patches-a282cdae107c8aec512b563f25dd411183ef2830.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system/mapped-devices.scm')
| -rw-r--r-- | gnu/system/mapped-devices.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index e44f2693a7..8ab861bf73 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 |