manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Mount NixOS EFI partition to /boot/efi

Browse source
This commit is contained in:
Manuel Thalmann 2023-12-01 15:59:48 +01:00
parent 1ba51897b6
commit 7ed35a070c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/Common/OS/partition.sh
View file

@ -8,6 +8,7 @@ OS_DISK="${OS_DISK}";
BOOT_LABEL="${BOOT_LABEL:-Boot}"; BOOT_LABEL="${BOOT_LABEL:-Boot}";
OS_LABEL="${OS_LABEL:-Linux}"; OS_LABEL="${OS_LABEL:-Linux}";
SWAP_LABEL="${SWAP_LABEL:-Swap}"; SWAP_LABEL="${SWAP_LABEL:-Swap}";
BOOT_MOUNTPOINT="${BOOT_MOUNTPOINT:-"/boot"}";
SKIP_FORMAT_EFI="${SKIP_FORMAT_EFI}"; SKIP_FORMAT_EFI="${SKIP_FORMAT_EFI}";
PARTITION_SCRIPT="${PARTITION_SCRIPT:-"./default-partition.sh"}"; PARTITION_SCRIPT="${PARTITION_SCRIPT:-"./default-partition.sh"}";
memory="$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }')"; memory="$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }')";
@ -62,7 +63,7 @@ then
bootDisk="/dev/disk/by-label/$BOOT_LABEL"; bootDisk="/dev/disk/by-label/$BOOT_LABEL";
fi fi
mount --mkdir "$bootDisk" "$OS_MOUNT_ROOT/boot"; mount --mkdir "$bootDisk" "$OS_MOUNT_ROOT$BOOT_MOUNTPOINT";
swapon "/dev/disk/by-label/$SWAP_LABEL"; swapon "/dev/disk/by-label/$SWAP_LABEL";
if command -v extraMounts if command -v extraMounts

1
scripts/NixOS/OS/setup.sh
View file

@ -10,6 +10,7 @@ OS_LABEL="${OS_LABEL:-NixOS}";
OS_MOUNT_ROOT="${NIXOS_MOUNT_ROOT}" \ OS_MOUNT_ROOT="${NIXOS_MOUNT_ROOT}" \
OS_DISK="${NIXOS_DISK}" \ OS_DISK="${NIXOS_DISK}" \
OS_LABEL="${OS_LABEL}" \ OS_LABEL="${OS_LABEL}" \
BOOT_MOUNTPOINT="/boot/efi" \
. "../../Common/OS/partition.sh"; . "../../Common/OS/partition.sh";
configRoot="$NIXOS_MOUNT_ROOT/etc/nixos"; configRoot="$NIXOS_MOUNT_ROOT/etc/nixos";