Skip to content

TPM/FDE: Use ignore action in VM #16620

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
ernestl merged 2 commits into from
May 4, 2026
Merged

TPM/FDE: Use ignore action in VM #16620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6134299
preinstall_sb: restore using ignore action for VM
didrocks Feb 18, 2026
5f53efa
preinstall_sb_test: Adapt the test to new defaults
didrocks Feb 18, 2026
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
6 changes: 3 additions & 3 deletions secboot/preinstall_sb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (

"github.com/snapcore/snapd/logger"
"github.com/snapcore/snapd/osutil"
"github.com/snapcore/snapd/snapdenv"
"github.com/snapcore/snapd/systemd"
)

Expand Down Expand Up @@ -80,10 +81,9 @@ func PreinstallCheck(ctx context.Context, bootImagePaths []string) (*PreinstallC
// - listed as Driver#### load options
// - referenced in the DriverOrder UEFI variable
// - loaded from PCI device option ROMs (e.g. network card PXE ROMs)
//TODO:FDEM: remove once secboot provides an action to apply this configuration
checkFlags := sb_preinstall.PermitAddonDrivers
if systemd.IsVirtualMachine() {
Comment thread
ernestl marked this conversation as resolved.
// when running in Virtual Machine, allow it
// For nested tests: muinstaller does not support interactions to ignore errors.
if systemd.IsVirtualMachine() && snapdenv.Testing() {
checkFlags |= sb_preinstall.PermitVirtualMachine
}

Expand Down
2 changes: 1 addition & 1 deletion secboot/preinstall_sb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ func (s *preinstallSuite) TestPreinstallCheckConfig(c *C) {
permitVM bool
}{
{false, false}, // default config
{true, true}, // modify default config to permit VM
{true, false}, // VM will trigger an ignore action
}

for _, tc := range testCases {
Expand Down
Loading