diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-11-23 21:53:24 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-11-23 21:56:31 +0100 |
| commit | b419c7f5fb5774b3af201550c11d9c5f867570ae (patch) | |
| tree | c7dd4f48d09d3b371d3f8f20b040293edf54f0e7 | |
| parent | b6e2215af76a350da7c37e2105a17e66bc5c0504 (diff) | |
| download | gnu-guix-b419c7f5fb5774b3af201550c11d9c5f867570ae.tar gnu-guix-b419c7f5fb5774b3af201550c11d9c5f867570ae.tar.gz | |
install: Add Cryptsetup to the image.
Reported by Nikita Karetnikov.
* gnu/system/install.scm (installation-os)[packages]: Add CRYPTSETUP.
* doc/guix.texi (System Installation): Mention it.
| -rw-r--r-- | doc/guix.texi | 5 | ||||
| -rw-r--r-- | gnu/system/install.scm | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 4868813876..a2f881fbe5 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -3275,8 +3275,9 @@ Systems}). This is typically done using the @code{-L} option of @command{mkfs.ext4} and related commands. The installation image includes Parted (@pxref{Overview,,, parted, GNU -Parted User Manual}), @command{fdisk}, and e2fsprogs, the suite of tools -to manipulate ext2/ext3/ext4 file systems. +Parted User Manual}), @command{fdisk}, Cryptsetup/LUKS for disk +encryption, and e2fsprogs, the suite of tools to manipulate +ext2/ext3/ext4 file systems. @item Once that is done, mount the target root partition under @file{/mnt}. diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 961361b937..dd3a3eb292 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -22,6 +22,7 @@ #:use-module (guix monads) #:use-module ((guix store) #:select (%store-prefix)) #:use-module (gnu packages linux) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages package-management) #:use-module (gnu packages disk) #:use-module (gnu packages grub) @@ -254,6 +255,7 @@ Use Alt-F2 for documentation. (packages (cons* texinfo-4 ;for the standalone Info reader parted ddrescue grub ;mostly so xrefs to its manual work + cryptsetup wireless-tools ;; XXX: We used to have GNU fdisk here, but as of version ;; 2.0.0a, that pulls Guile 1.8, which takes unreasonable |