Skip to content

Commit e0b3d80

Browse files
liulanzelanzeliu
andauthored
Bugfix - Skip Dracut Module and Mariner.cfg Update with no Verity Cfg. (#7234)
Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
1 parent ff88067 commit e0b3d80

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

toolkit/tools/pkg/imagecustomizerlib/customizeutils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func doCustomizations(buildDir string, baseConfigPath string, config *imagecusto
9999
return err
100100
}
101101

102-
err = enableVerityPartition(imageChroot)
102+
err = enableVerityPartition(config.SystemConfig.Verity, imageChroot)
103103
if err != nil {
104104
return err
105105
}

toolkit/tools/pkg/imagecustomizerlib/customizeverity.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@ import (
1717
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/shell"
1818
)
1919

20-
func enableVerityPartition(imageChroot *safechroot.Chroot) error {
20+
func enableVerityPartition(verity *imagecustomizerapi.Verity, imageChroot *safechroot.Chroot) error {
2121
var err error
2222

23+
if verity == nil {
24+
return nil
25+
}
26+
2327
// Integrate systemd veritysetup dracut module into initramfs img.
2428
systemdVerityDracutModule := "systemd-veritysetup"
2529
err = buildDracutModule(systemdVerityDracutModule, imageChroot)

0 commit comments

Comments
 (0)