root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

set-default subvolume

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-24 08:35:51 +01:00
parent 9446afb915
commit cedae81c34
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/lib/archboot/installer/autoprepare.sh
View file

@ -272,10 +272,8 @@ _autoprepare() {
"${_BTRFS_DEVS}" "${_BTRFS_LEVEL}" "${_BTRFS_SUBVOLUME}" "${_BTRFS_COMPRESS}" || return 1
sleep 1
# set default subvolume for systemd-gpt-autogenerator
if [[ "${_FSTYPE}" == "btrfs" ]]; then
[[ "${_MP}" == "/" ]] && _BTRFS_SUBVOLUME="root"
[[ "${_MP}" == "/home" ]] && _BTRFS_SUBVOLUME="home"
btrfs subvolume set-default "${_BTRFS_SUBVOLUME}" "${_DESTDIR}"/${_MP} || return 1
if [[ "${_FSTYPE}" == "btrfs" ]]; then
btrfs subvolume set-default "${_DESTDIR}"/${_MP} || return 1
fi
done
_dialog --infobox "Auto-Prepare was successful.\nContinuing in 5 seconds..." 4 40

2
usr/lib/archboot/installer/mountpoints.sh
View file

@ -380,7 +380,7 @@ _mkfs() {
# https://www.freedesktop.org/software/systemd/man/systemd-gpt-auto-generator.html
# systemd supports detection on GPT disks:
# GRUB and rEFInd don't support /efi automount!
# disabled for now "${_GUID_VALUE}" == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && "${5}" == "/efi"
# disabled for now this check: "${_GUID_VALUE}" == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && "${5}" == "/efi"
# /boot or /efi as ESP: c12a7328-f81f-11d2-ba4b-00a0c93ec93b
# /boot as Extended Boot Loader Partition: bc13c2ff-59e6-4262-a352-b275fd6f7172
# swap: 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f