Skip to content

partitioning: Add BTRFS_ROOT_SUBVOLUME switch #8144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igorpecovnik merged 3 commits into from
May 5, 2025
Merged

partitioning: Add BTRFS_ROOT_SUBVOLUME switch #8144

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f241c87
partitioning: Add BTRFS_ROOT_SUBVOLUME switch
kageurufu Apr 29, 2025
f52a0ff
partitioning: Rely on the btrfs default subvolume for remounting
kageurufu Apr 29, 2025
7a8b5d4
partitioning: Use btrfs set-default MOUNT/subvolume
kageurufu Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/functions/image/partitioning.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,13 +330,13 @@ function prepare_partitions() {
fi

if [[ $ROOTFS_TYPE == btrfs ]]; then
btrfs_root_subvolume="${BTRFS_ROOT_SUBVOLUME:-@}"
mountopts[$ROOTFS_TYPE]='commit=120'
run_host_command_logged btrfs subvolume create $MOUNT/@
run_host_command_logged btrfs subvolume create $MOUNT/$btrfs_root_subvolume
# getting the subvolume id of the newly created volume @ to install it
# as the default volume for mounting without explicit reference

run_host_command_logged "btrfs subvolume list $MOUNT | grep 'path @' | cut -d' ' -f2 \
| xargs -I{} btrfs subvolume set-default {} $MOUNT/ "
run_host_command_logged "btrfs subvolume set-default $MOUNT/$btrfs_root_subvolume"

call_extension_method "btrfs_root_add_subvolumes" <<- 'BTRFS_ROOT_ADD_SUBVOLUMES'
# *custom post btrfs rootfs creation hook*
Expand All @@ -352,7 +352,7 @@ function prepare_partitions() {

run_host_command_logged umount $rootdevice
display_alert "Remounting rootfs" "$rootdevice (UUID=${ROOT_PART_UUID})"
run_host_command_logged mount -odefaults,${mountopts[$ROOTFS_TYPE]},subvol=@ $rootdevice $MOUNT/
run_host_command_logged mount -odefaults,${mountopts[$ROOTFS_TYPE]} $rootdevice $MOUNT/
fi
rootfs="UUID=$(blkid -s UUID -o value $rootdevice)"
echo "$rootfs / ${mkfs[$ROOTFS_TYPE]} defaults,${mountopts[$ROOTFS_TYPE]} 0 1" >> $SDCARD/etc/fstab
Expand Down