Skip to content

Commit 1ffb631

Browse files
abensonericonr
authored andcommitted
fde: clean up and command improvements
- clean up trailing whitespace - use a cleaner UUID command - change keyfile size to match real keysize
1 parent 72a8e5d commit 1ffb631

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

src/installation/guides/fde.md

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ WARNING!
5353
This will overwrite data on /dev/sda1 irrevocably.
5454
5555
Are you sure? (Type uppercase yes): YES
56-
Enter passphrase:
57-
Verify passphrase:
56+
Enter passphrase:
57+
Verify passphrase:
5858
```
5959

6060
Once the volume is created, it needs to be opened. Replace voidvm with an
6161
appropriate name. Again, this will be `/dev/sda2` on EFI systems.
6262

6363
```
64-
# cryptsetup luksOpen /dev/sda1 voidvm
65-
Enter passphrase for /dev/sda1:
64+
# cryptsetup luksOpen /dev/sda1 voidvm
65+
Enter passphrase for /dev/sda1:
6666
```
6767

6868
Once the LUKS container is opened, create the LVM volume group using that
@@ -93,7 +93,7 @@ GRUB](https://www.gnu.org/software/grub/manual/grub/grub.html#Features) will
9393
work.
9494

9595
```
96-
# mkfs.xfs -L root /dev/voidvm/root
96+
# mkfs.xfs -L root /dev/voidvm/root
9797
meta-data=/dev/voidvm/root isize=512 agcount=4, agsize=655360 blks
9898
...
9999
# mkfs.xfs -L home /dev/voidvm/home
@@ -185,33 +185,31 @@ Next, the kernel needs to be configured to find the encrypted device. First,
185185
find the UUID of the device.
186186

187187
```
188-
# lsblk -l -o NAME,UUID
189-
NAME UUID
190-
sda
191-
sda1 135f3c06-26a0-437f-a05e-287b036440a4
192-
...
188+
# blkid -o value -s UUID /dev/sda1
189+
135f3c06-26a0-437f-a05e-287b036440a4
193190
```
194191

195192
Edit the `GRUB_CMDLINE_LINUX_DEFAULT=` line in `/etc/default/grub` and add
196193
`rd.lvm.vg=voidvm rd.luks.uuid=<UUID>` to it. Make sure the UUID matches the one
197-
for the `sda1` device found in the output of the `lsblk` command above.
194+
for the `sda1` device found in the output of the
195+
[blkid(8)](https://man.voidlinux.org/blkid.8) command above.
198196

199197
And now to avoid having to enter the password twice on boot, a key will be
200198
configured to automatically unlock the encrypted volume on boot. First, generate
201199
a random key.
202200

203201
```
204-
# dd bs=512 count=4 if=/dev/urandom of=/boot/volume.key
205-
4+0 records in
206-
4+0 records out
207-
2048 bytes (2.0 kB, 2.0 KiB) copied, 0.000421265 s, 4.9 MB/s
202+
# dd bs=1 count=64 if=/dev/urandom of=/boot/volume.key
203+
64+0 records in
204+
64+0 records out
205+
64 bytes copied, 0.000662757 s, 96.6 kB/s
208206
```
209207

210208
Next, add the key to the encrypted volume.
211209

212210
```
213211
# cryptsetup luksAddKey /dev/sda1 /boot/volume.key
214-
Enter any existing passphrase:
212+
Enter any existing passphrase:
215213
```
216214

217215
Change the permissions to protect generated the key.

0 commit comments

Comments
 (0)