Merge branch 'main' into refind

This commit is contained in:
Tommaso Chiti 2024-07-17 11:45:42 +02:00 committed by GitHub
commit 563e29e727
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 5 deletions

6
.github/dependabot.yml vendored Normal file
View file

@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"

View file

@ -17,6 +17,6 @@ jobs:
name: Bash syntax checker name: Bash syntax checker
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v4
- name: Run ShellCheck - name: Run ShellCheck
uses: ludeeus/action-shellcheck@master uses: ludeeus/action-shellcheck@master

View file

@ -28,12 +28,12 @@ bash easy-arch.sh
## Partitions layout ## Partitions layout
The **partitions layout** is simple and it consists solely of two partitions: The **partitions layout** is simple and it consists solely of two partitions:
1. A **FAT32** partition (512MiB), mounted at `/boot/` as ESP. 1. A **FAT32** partition (1GiB), mounted at `/boot/` as ESP.
2. A **LUKS2 encrypted container**, which takes the rest of the disk space, mounted at `/` as root. 2. A **LUKS2 encrypted container**, which takes the rest of the disk space, mounted at `/` as root.
| Partition Number | Label | Size | Mountpoint | Filesystem | | Partition Number | Label | Size | Mountpoint | Filesystem |
|------------------|-----------|-------------------|----------------|-------------------------| |------------------|-----------|-------------------|----------------|-------------------------|
| 1 | ESP | 512 MiB | /boot/ | FAT32 | | 1 | ESP | 1 GiB | /boot/ | FAT32 |
| 2 | Cryptroot | Rest of the disk | / | BTRFS Encrypted (LUKS2) | | 2 | Cryptroot | Rest of the disk | / | BTRFS Encrypted (LUKS2) |
## BTRFS subvolumes layout ## BTRFS subvolumes layout

View file

@ -306,9 +306,9 @@ sgdisk -Zo "$DISK" &>/dev/null
info_print "Creating the partitions on $DISK." info_print "Creating the partitions on $DISK."
parted -s "$DISK" \ parted -s "$DISK" \
mklabel gpt \ mklabel gpt \
mkpart ESP fat32 1MiB 513MiB \ mkpart ESP fat32 1MiB 1025MiB \
set 1 esp on \ set 1 esp on \
mkpart CRYPTROOT 513MiB 100% \ mkpart CRYPTROOT 1025MiB 100% \
ESP="/dev/disk/by-partlabel/ESP" ESP="/dev/disk/by-partlabel/ESP"
CRYPTROOT="/dev/disk/by-partlabel/CRYPTROOT" CRYPTROOT="/dev/disk/by-partlabel/CRYPTROOT"
@ -406,6 +406,10 @@ arch-chroot /mnt /bin/bash -e <<EOF
# Generating locales. # Generating locales.
locale-gen &>/dev/null locale-gen &>/dev/null
# Create SecureBoot keys.
# This isn't strictly necessary, linux-hardened preset expects it and mkinitcpio will fail without it
sbctl create-keys
# Generating a new initramfs. # Generating a new initramfs.
mkinitcpio -P &>/dev/null mkinitcpio -P &>/dev/null