Skip to content

Bugfix - Skip Dracut Module and Mariner.cfg Update with no Verity Cfg. #7234

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
liulanze merged 1 commit into from
Jan 16, 2024
Merged

Bugfix - Skip Dracut Module and Mariner.cfg Update with no Verity Cfg. #7234

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
2 changes: 1 addition & 1 deletion toolkit/tools/pkg/imagecustomizerlib/customizeutils.go
View file
Open in desktop
Comment thread
liulanze marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func doCustomizations(buildDir string, baseConfigPath string, config *imagecusto
return err
}

err = enableVerityPartition(imageChroot)
err = enableVerityPartition(config.SystemConfig.Verity, imageChroot)
Copy link
Copy Markdown
Member

@mfrw mfrw Jan 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on doing the check before the function call to avoid adding an argument.

if err != nil {
return err
}
Expand Down
6 changes: 5 additions & 1 deletion toolkit/tools/pkg/imagecustomizerlib/customizeverity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/shell"
)

func enableVerityPartition(imageChroot *safechroot.Chroot) error {
func enableVerityPartition(verity *imagecustomizerapi.Verity, imageChroot *safechroot.Chroot) error {
var err error

if verity == nil {
return nil
}

// Integrate systemd veritysetup dracut module into initramfs img.
systemdVerityDracutModule := "systemd-veritysetup"
err = buildDracutModule(systemdVerityDracutModule, imageChroot)
Expand Down