From 2306ec2b73135f9c8a2819ad0fe9aa95fd7181d5 Mon Sep 17 00:00:00 2001
From: Luc <luc@bijl.us>
Date: Mon, 8 Jul 2024 11:50:40 +0200
Subject: [PATCH] Fixed some minor errors.

---
 .../installation/installation.md              | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs/alpine-server-setup/installation/installation.md b/docs/alpine-server-setup/installation/installation.md
index 5019790..5d07b1c 100644
--- a/docs/alpine-server-setup/installation/installation.md
+++ b/docs/alpine-server-setup/installation/installation.md
@@ -51,13 +51,19 @@ clock_systohc="NO"
 Edit `/etc/fstab` for correct mounts:
 
 ```
-/dev/disk/by-label/efi      /efi        vfat    defaults,nodev,nosuid,noexec                            0 2
-/dev/disk/by-label/main     /           btrfs   defaults,noatime,subvol=/@root                          0 1
-/dev/disk/by-label/main     /home       btrfs   defaults,noatime,nosuid,nodev,subvol=/@home             0 2
-/dev/disk/by-label/main     /var        btrfs   defaults,nodev,nosuid,noexec,subvol=/@var               0 2
-/dev/disk/by-label/main     /nix        btrfs   defaults,noatime,nodev,nosuid,subvol=/@nix              0 2
-tmpfs                       /tmp        tmpfs   rw,size=4G,nr_inodes=5k,noexec,nodev,nosuid,mode=1777   0 0
-proc                        /proc       proc    nosuid,nodev,noexec,hidepid=2                           0 0
+/dev/disk/by-label/efi             /efi        vfat    defaults,nodev,nosuid,noexec                            0 2
+/dev/disk/by-uuid/<volume-uuid>    /           btrfs   defaults,noatime,subvol=/@root                          0 1
+/dev/disk/by-uuid/<volume-uuid>    /home       btrfs   defaults,noatime,nodev,nosuid,subvol=/@home             0 2
+/dev/disk/by-uuid/<volume-uuid>    /var        btrfs   defaults,nodev,nosuid,noexec,subvol=/@var               0 2
+/dev/disk/by-uuid/<volume-uuid>    /nix        btrfs   defaults,noatime,nodev,nosuid,subvol=/@nix              0 2
+tmpfs                              /tmp        tmpfs   rw,size=4G,nr_inodes=5k,noexec,nodev,nosuid,mode=1777   0 0
+proc                               /proc       proc    nosuid,nodev,noexec,hidepid=2                           0 0
+```
+
+Here `<volume-uuid>` has to be replaced with the uuid of the main volume:
+
+```
+# blkid /dev/mapper/luks >> /etc/fstab
 ```
 
 By default, Alpine Linux uses `mkinitfs` to create an initial ram filesystem, although it is minimal that also means that it lacks some functionality which is needed for a proper setup. Because of this `mkinitfs` and `grub-efi `will be replaced with `booster` and `secureboot-hook`.
@@ -89,7 +95,7 @@ to:
 and configure `/etc/kernel-hooks.d/secureboot.conf` for cmdline and secureboot. 
 
 ```
-cmdline="rw rd.luks.name=<uuid>=luks root=/dev/disk/by-label/main rootflags=subvol=/@root quiet splash"
+cmdline="rw rd.luks.name="<partition-uuid>"=luks root=/dev/disk/by-uuid/<volume-uuid> rootflags=subvol=/@root quiet splash"
 
 signing_cert="/usr/share/secureboot/keys/db/db.pem"
 signing_key="/usr/share/secureboot/keys/db/db.key"
@@ -99,10 +105,11 @@ output_dir="/efi/EFI/Linux"
 output_name="alpine-linux-{flavor}.efi"
 ```
 
-Here `<uuid>` has to be replaced with the uuid of the partition which contains the volume group:
+Here `<partition-uuid>` and `<volume-uuid>` have to be replaced with the uuid of the main partition and volume respectively.
 
 ```
 # blkid /dev/<disk>2 >> /etc/kernel-hooks.d/secureboot.conf
+# blkid /dev/mapper/luks >> /etc/kernel-hooks.d/secureboot.conf
 ```
 
 Use `sbctl` to create secureboot keys and sign them.