Skip to content

Comments

Fix/encryption verity decoupling#1755

Merged
brianmcgillion merged 2 commits intotiiuae:mainfrom
brianmcgillion:fix/encryption-verity-decoupling
Feb 15, 2026
Merged

Fix/encryption verity decoupling#1755
brianmcgillion merged 2 commits intotiiuae:mainfrom
brianmcgillion:fix/encryption-verity-decoupling

Conversation

@brianmcgillion
Copy link
Collaborator

Description of Changes

Type of Change

  • New Feature
  • Bug Fix
  • Improvement / Refactor

Related Issues / Tickets

Checklist

  • Clear summary in PR description
  • Detailed and meaningful commit message(s)
  • Commits are logically organized and squashed if appropriate
  • Contribution guidelines followed
  • Ghaf documentation updated with the commit - https://tiiuae.github.io/ghaf/
  • Author has run make-checks and it passes
  • All automatic GitHub Action checks pass - see actions
  • Author has added reviewers and removed PR draft status

Testing Instructions

Applicable Targets

  • Orin AGX aarch64
  • Orin NX aarch64
  • Lenovo X1 x86_64
  • Dell Latitude x86_64
  • System 76 x86_64

Installation Method

  • Requires full re-installation
  • Can be updated with nixos-rebuild ... switch
  • Other:

Test Steps To Verify:

  1. ...

verity and encryption were bound because of the the partition check in
disk-encryption which made it impossible to enable encryption downstream
without defining a verity option.

This breaks the verity and encryption, allowing either OR to be enabled
as needed.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
Btrfs, had to know about all the possible partitioning schemes and
switch depending on which was enabled. This forced a strong coupling
that has to be maintained when different partitions are define.

This change is more in line with nixos module system where a module or
feature is enabled and then consumed by the feature that requres it. So
it is more a pull that a push, in line with the latest refactoring.

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
@brianmcgillion brianmcgillion merged commit 1c26384 into tiiuae:main Feb 15, 2026
31 of 32 checks passed
@brianmcgillion brianmcgillion deleted the fix/encryption-verity-decoupling branch February 15, 2026 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant