From 3f4af19037d18ab4f8af34af70ef6ca26ba1a040 Mon Sep 17 00:00:00 2001 From: Tastatur Date: Sat, 20 Jan 2024 15:33:21 +0100 Subject: [PATCH] Updated mount points --- docs/alpine-desktop-setup/installation.md | 32 +++++++++++------------ docs/alpine-desktop-setup/provisioning.md | 7 +++-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/docs/alpine-desktop-setup/installation.md b/docs/alpine-desktop-setup/installation.md index e6b73c7..449ed92 100644 --- a/docs/alpine-desktop-setup/installation.md +++ b/docs/alpine-desktop-setup/installation.md @@ -4,8 +4,8 @@ To install the Alpine Linux distribution on the system, the encrypted partition ``` # mount /dev/vg/alp_root /mnt -t ext4 -# mkdir /mnt/boot/efi -p -# mount /dev/ /mnt/boot/efi -t vfat +# mkdir /mnt/efi -p +# mount /dev/ /mnt/efi -t vfat ``` Then set up the base system using `setup-disk`: @@ -49,13 +49,13 @@ clock_systohc="NO" Edit `/etc/fstab` for correct mounts: ``` -/dev/disk/by-label/efi /boot/efi vfat defaults,nodev,nosuid,noexec 0 2 -/dev/vg/alp_root / ext4 defaults,noatime 0 1 -/dev/vg/alp_home /home ext4 defaults,noatime,nosuid,nodev 0 2 -/dev/vg/alp_tmp /tmp ext4 defaults,nodev,nosuid,noexec 0 2 -/dev/vg/alp_var /var ext4 defaults,nodev,nosuid,noexec 0 2 -/dev/vg/alp_nix /nix ext4 defaults,noatime,nodev,nosuid 0 2 -proc /proc proc nosuid,nodev,noexec,hidepid=2 0 0 +/dev/disk/by-label/efi /efi vfat defaults,nodev,nosuid,noexec 0 2 +/dev/vg/alp_root / ext4 defaults,noatime 0 1 +/dev/vg/alp_home /home ext4 defaults,noatime,nosuid,nodev 0 2 +/dev/vg/alp_var /var ext4 defaults,nodev,nosuid,noexec 0 2 +/dev/vg/alp_nix /nix ext4 defaults,noatime,nodev,nosuid 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 ``` By default Alpine Linux uses `mkinitfs` to create initramfs, 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`. @@ -93,7 +93,7 @@ cmdline="rw rd.luks.name==luks root=/dev/vg/alp_root modules=ext4 quiet signing_cert="/usr/share/secureboot/keys/db/db.pem" signing_key="/usr/share/secureboot/keys/db/db.key" -output_dir="/boot/efi/EFI/Linux" +output_dir="/efi/EFI/Linux" output_name="alpine-linux-{flavor}.efi" ``` @@ -126,21 +126,21 @@ As discussed earlier `grub` will be replaced, install `gummiboot` as a bootloade ``` # apk add gummiboot -# gummiboot install --path=/boot/efi -# sbctl sign -s /boot/efi/EFI/gummiboot/gummibootx64.efi -# sbctl sign -s /boot/efi/EFI/Boot/BOOTX64.EFI +# gummiboot install --path=/efi +# sbctl sign -s /efi/EFI/gummiboot/gummibootx64.efi +# sbctl sign -s /efi/EFI/Boot/BOOTX64.EFI ``` And also remove some remnants of `grub`. ``` -# rm -rf /boot/efi/EFI/alpine -# rm -rf /boot/grub +# rm -rf /efi/EFI/alpine +# rm -rf /grub # rm -rf /etc/default # cd /boot && unlink boot ``` -The `os-prober` package may be installed that may find operating systems and add them to the bootloader. Besides that `gummiboot` can also be configured with the file `/boot/efi/loader/loader.conf` with which the timeout and the default OS can be specified. +The `os-prober` package may be installed that may find operating systems and add them to the bootloader. Besides that `gummiboot` can also be configured with the file `/efi/loader/loader.conf` with which the timeout and the default OS can be specified. ``` default alpine diff --git a/docs/alpine-desktop-setup/provisioning.md b/docs/alpine-desktop-setup/provisioning.md index c5f7905..7945491 100644 --- a/docs/alpine-desktop-setup/provisioning.md +++ b/docs/alpine-desktop-setup/provisioning.md @@ -53,9 +53,8 @@ Now to create a new LVM volume group, choose $n \in \mathbb{N}$ accordingly: Then create partitions inside the volume group: ``` -# lvcreate --name alp_root -L 16G vg -# lvcreate --name alp_var -L 8G vg -# lvcreate --name alp_tmp -L 8G vg +# lvcreate --name alp_root -L 20G vg +# lvcreate --name alp_var -L 4G vg # lvcreate --name alp_nix -L 32G vg # lvcreate --name alp_home -l 100%FREE vg ``` @@ -65,7 +64,7 @@ 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 var tmp nix home; do +for i in root var nix home; do > mkfs.ext4 /dev/vg/alp_$i > done ```