From 93eab813411a0de6a5ecaa8c8cf6677a180005a7 Mon Sep 17 00:00:00 2001 From: Tastatur Date: Wed, 27 Dec 2023 12:08:59 +0100 Subject: [PATCH 1/3] blkid busybox --- docs/alpine-desktop-setup/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/alpine-desktop-setup/installation.md b/docs/alpine-desktop-setup/installation.md index da84478..31d79bc 100644 --- a/docs/alpine-desktop-setup/installation.md +++ b/docs/alpine-desktop-setup/installation.md @@ -102,7 +102,7 @@ output_name="alpine-linux-{flavor}.efi" Here `` has to be replaced with the uuid of the partition which contains our volume group: ``` -# blkid -o value -s UUID /dev/ >> /etc/kernel-hooks.d/secureboot.conf +# blkid /dev/ >> /etc/kernel-hooks.d/secureboot.conf ``` All that's left for booting is secureboot which `sbctl` will be used for to create keys, and sign some executables with. From ebe54eb884693875f37aa9916e50ee45a0f17698 Mon Sep 17 00:00:00 2001 From: Tastatur Date: Wed, 27 Dec 2023 12:17:46 +0100 Subject: [PATCH 2/3] Fixed luks naming scheme --- docs/alpine-desktop-setup/installation.md | 2 +- docs/alpine-desktop-setup/provisioning.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/alpine-desktop-setup/installation.md b/docs/alpine-desktop-setup/installation.md index 31d79bc..1784a12 100644 --- a/docs/alpine-desktop-setup/installation.md +++ b/docs/alpine-desktop-setup/installation.md @@ -89,7 +89,7 @@ To: And configure `/etc/kernel-hooks.d/secureboot.conf` for cmdline and secureboot. ``` -cmdline="rw rd.luks.name==root root=/dev/vg1/root{n} modules=ext4 quiet splash rd.lvm.vg=vg1" +cmdline="rw rd.luks.name==luks root=/dev/vg1/root{n} modules=ext4 quiet splash rd.lvm.vg=vg1" signing_cert="/usr/share/secureboot/keys/db/db.pem" signing_key="/usr/share/secureboot/keys/db/db.key" diff --git a/docs/alpine-desktop-setup/provisioning.md b/docs/alpine-desktop-setup/provisioning.md index 78aeed5..122b9b5 100644 --- a/docs/alpine-desktop-setup/provisioning.md +++ b/docs/alpine-desktop-setup/provisioning.md @@ -31,8 +31,8 @@ Then to create the filesystem on the efi partition. And the encrypted filesystem on the root partition. ``` -# cryptsetup luksFormat /dev/ --type luks2 --label luks -# cryptsetup open --type luks /dev/ pv1 +# cryptsetup luksFormat /dev/ --type luks2 +# cryptsetup open --type luks /dev/ luks ``` Now to create a new LVM volume group: @@ -61,4 +61,4 @@ for i in root{n} var{n} tmp{n} nix{n} home{n}; do > done ``` -Other filesystems can also be used but `ext4` is the standard for most Linux distrobutions. \ No newline at end of file +Other filesystems can also be used but `ext4` is the standard for most Linux distrobutions. From 7ee1bc099d70561ca8a78ba361118230632ed59a Mon Sep 17 00:00:00 2001 From: Tastatur Date: Wed, 27 Dec 2023 12:18:17 +0100 Subject: [PATCH 3/3] Fixed luks naming scheme 2 --- docs/alpine-desktop-setup/provisioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/alpine-desktop-setup/provisioning.md b/docs/alpine-desktop-setup/provisioning.md index 122b9b5..e574986 100644 --- a/docs/alpine-desktop-setup/provisioning.md +++ b/docs/alpine-desktop-setup/provisioning.md @@ -38,7 +38,7 @@ And the encrypted filesystem on the root partition. Now to create a new LVM volume group: ``` -# vgcreate vg1 /dev/mapper/pv1 +# vgcreate vg1 /dev/mapper/luks ``` To create partitions inside the volume group: