summary refs log tree commit diff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-11-04 10:27:12 +0100
committerLudovic Courtès <ludo@gnu.org>2015-11-04 10:54:39 +0100
commit316d65be0ca41c277349c4f0127513f98dbec680 (patch)
tree305a11b7655dc9d973ac60a441022a90934d3ccf /gnu/system
parent5ffea4776d33e73922aa5fdbb7ac4dafbfbf15c5 (diff)
downloadguix-316d65be0ca41c277349c4f0127513f98dbec680.tar.gz
doc: Back up on the claim of encrypted root partitions.
Reported by 宋文武 <iyzsong@openmailbox.org>
at <https://lists.gnu.org/archive/html/guix-devel/2015-11/msg00096.html>.

* doc/guix.texi (System Installation): Comment out encrypted root
  partition commands.
* gnu/system/examples/desktop.tmpl (mapped-devices): Remove.
  (file-systems): Refer to the root by label.
* NEWS: Adjust.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/examples/desktop.tmpl12
1 files changed, 2 insertions, 10 deletions
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index 7a479d1123..ee660e0589 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -13,17 +13,9 @@
   ;; Assuming /dev/sdX is the target hard disk, and "root" is
   ;; the label of the target root file system.
   (bootloader (grub-configuration (device "/dev/sdX")))
-
-  ;; Here we assume that /dev/sdX1 contains a LUKS-encrypted
-  ;; root partition created with 'cryptsetup luksFormat'.
-  (mapped-devices (list (mapped-device
-                          (source "/dev/sdX1")
-                          (target "root-partition")
-                          (type luks-device-mapping))))
-
-  ;; Mount said encrypted partition.
   (file-systems (cons (file-system
-                        (device "/dev/mapper/root-partition")
+                        (device "root")
+                        (title 'label)
                         (mount-point "/")
                         (type "ext4"))
                       %base-file-systems))