From 17563f77cfa93be3b14f145a0bad8415b4b52006 Mon Sep 17 00:00:00 2001 From: Tastatur Date: Wed, 27 Dec 2023 14:15:07 +0100 Subject: [PATCH] <> instead of {} --- docs/alpine-desktop-setup/installation.md | 18 +++++++++--------- docs/alpine-desktop-setup/provisioning.md | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/alpine-desktop-setup/installation.md b/docs/alpine-desktop-setup/installation.md index 354e820..9903b58 100644 --- a/docs/alpine-desktop-setup/installation.md +++ b/docs/alpine-desktop-setup/installation.md @@ -3,7 +3,7 @@ To install the Alpine Linux distribution on the system, the encrypted partition and the efi partition have to be mounted to the main system. ``` -# mount /dev/vg{m}/root{n} /mnt -t ext4 +# mount /dev/vg/root /mnt -t ext4 # mkdir /mnt/boot/efi -p # mount /dev/ /mnt/boot/efi -t vfat ``` @@ -22,8 +22,8 @@ Now the other directories are going to be mounted so that it's possible to chroo # for i in dev proc sys run; do > mount --rbind --make-rslave /$i /mnt/$i > done -# mount /dev/vg{m}/var{n} /mnt/var -# mount /dev/vg{m}/tmp{n} /mnt/tmp +# mount /dev/vg/var /mnt/var +# mount /dev/vg/tmp /mnt/tmp # chroot /mnt ``` @@ -50,11 +50,11 @@ Edit `/etc/fstab` for correct mounts: ``` /dev/disk/by-label/efi /boot/efi vfat defaults 0 2 -/dev/vg{m}/root{n} / ext4 defaults,noatime 0 1 -/dev/vg{m}/home{n} /home ext4 defaults,noatime,nodev 0 1 -/dev/vg{m}/tmp{n} /tmp ext4 defaults,nodev,nosuid,noexec 0 1 -/dev/vg{m}/var{n} /var ext4 defaults,nodev,nosuid,noexec 0 1 -/dev/vg{m}/nix{n} /nix ext4 defaults,nodev,nosuid 0 1 +/dev/vg/root / ext4 defaults,noatime 0 1 +/dev/vg/home /home ext4 defaults,noatime,nodev 0 1 +/dev/vg/tmp /tmp ext4 defaults,nodev,nosuid,noexec 0 1 +/dev/vg/var /var ext4 defaults,nodev,nosuid,noexec 0 1 +/dev/vg/nix /nix ext4 defaults,nodev,nosuid 0 1 proc /proc proc nosuid,nodev,noexec,hidepid=2 0 0 ``` @@ -88,7 +88,7 @@ To: And configure `/etc/kernel-hooks.d/secureboot.conf` for cmdline and secureboot. ``` -cmdline="rw rd.luks.name==luks root=/dev/vg{m}/root{n} modules=ext4 quiet splash rd.lvm.vg=vg{m}" +cmdline="rw rd.luks.name==luks root=/dev/vg/root modules=ext4 quiet splash rd.lvm.vg=vg" 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 000d0c8..8f6e5b4 100644 --- a/docs/alpine-desktop-setup/provisioning.md +++ b/docs/alpine-desktop-setup/provisioning.md @@ -38,17 +38,17 @@ And the encrypted filesystem on the root partition. Now to create a new LVM volume group (choose $m,n \in \mathbb{N}$ accordingly): ``` -# vgcreate vg{m} /dev/mapper/luks +# vgcreate vg /dev/mapper/luks ``` To create partitions inside the volume group: ``` -# lvcreate --name root{n} -L 16G vg{m} -# lvcreate --name var{n} -L 8G vg{m} -# lvcreate --name tmp{n} -L 16G vg{m} -# lvcreate --name nix{n} -L 32G vg{m} -# lvcreate --name home{n} -l 100%FREE vg{m} +# lvcreate --name root -L 16G vg +# lvcreate --name var -L 8G vg +# lvcreate --name tmp -L 16G vg +# lvcreate --name nix -L 32G vg +# lvcreate --name home -l 100%FREE vg ``` Now the home partition fills the entirety of the volume group. These sizes should be changed depending on the needs of the user. @@ -56,8 +56,8 @@ Now the home partition fills the entirety of the volume group. These sizes shoul To create the filesystems on the logical partitions: ``` -for i in root{n} var{n} tmp{n} nix{n} home{n}; do -> mkfs.ext4 /dev/vg{m}/$i +for i in root var tmp nix home; do +> mkfs.ext4 /dev/vg/$i > done ```