Skip to content

policy: allow /boot on btrfs (HMS-9737) #36

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
achilleas-k merged 1 commit into from
Dec 12, 2025
Merged

policy: allow /boot on btrfs (HMS-9737) #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions pkg/blueprint/disk_customizations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,17 @@ func validateFilesystemType(path, fstype string) error {
return nil
}

// These mountpoints must be on a plain partition (i.e. not on LVM or btrfs).
var plainOnlyMountpoints = []string{
// These mountpoints must be on a plain partition (i.e. not on LVM).
var plainOnlyMountpointsForLVM = []string{
"/boot",
"/boot/efi", // not allowed by our global policies, but that might change
}

// These mountpoints must be on a plain partition (i.e. not on btrfs).
var plainOnlyMountpointsForBtrfs = []string{
"/boot/efi", // not allowed by our global policies, but that might change
}

var validPlainFSTypes = []string{
"ext4",
"vfat",
Expand Down Expand Up @@ -681,7 +686,7 @@ func (p *PartitionCustomization) validateLVM(mountpoints, vgnames map[string]boo
}
mountpoints[lv.Mountpoint] = true

if slices.Contains(plainOnlyMountpoints, lv.Mountpoint) {
if slices.Contains(plainOnlyMountpointsForLVM, lv.Mountpoint) {
return fmt.Errorf("invalid mountpoint %q for logical volume", lv.Mountpoint)
}

Expand Down Expand Up @@ -722,7 +727,7 @@ func (p *PartitionCustomization) validateBtrfs(mountpoints map[string]bool) erro
if mountpoints[subvol.Mountpoint] {
return fmt.Errorf("duplicate mountpoint %q in partitioning customizations", subvol.Mountpoint)
}
if slices.Contains(plainOnlyMountpoints, subvol.Mountpoint) {
if slices.Contains(plainOnlyMountpointsForBtrfs, subvol.Mountpoint) {
return fmt.Errorf("invalid mountpoint %q for btrfs subvolume", subvol.Mountpoint)
}
mountpoints[subvol.Mountpoint] = true
Expand Down
4 changes: 2 additions & 2 deletions pkg/blueprint/disk_customizations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ func TestPartitioningValidation(t *testing.T) {
},
expectedMsg: "invalid partitioning customizations:\ninvalid mountpoint \"/boot/efi\" for logical volume",
},
"boot-on-btrfs": {
"happy-boot-on-btrfs": {
partitioning: &blueprint.DiskCustomization{
Partitions: []blueprint.PartitionCustomization{
{
Expand All @@ -797,7 +797,7 @@ func TestPartitioningValidation(t *testing.T) {
},
},
},
expectedMsg: "invalid partitioning customizations:\ninvalid mountpoint \"/boot\" for btrfs subvolume",
expectedMsg: "",
},
"bootefi-on-btrfs": {
partitioning: &blueprint.DiskCustomization{
Expand Down
Loading