Skip to content

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

Merged
liulanze merged 1 commit intomainfrom
user/lanzeliu/verity-dracut-bugfix
Jan 16, 2024
Merged

Bugfix - Skip Dracut Module and Mariner.cfg Update with no Verity Cfg.#7234
liulanze merged 1 commit intomainfrom
user/lanzeliu/verity-dracut-bugfix

Conversation

@liulanze
Copy link
Copy Markdown
Contributor

@liulanze liulanze commented Jan 11, 2024

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

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?
Title says, skip Dracut module re-building and Mariner.cfg updating when users do NOT customize Verity related configs.

Change Log
  • Add an additional if statement checking for Verity field exists or not.
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Local
Internal Bug Ticket Number: 6515

@liulanze liulanze requested a review from a team as a code owner January 11, 2024 18:54
@liulanze liulanze self-assigned this Jan 11, 2024
@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label Jan 11, 2024
Comment thread toolkit/tools/pkg/imagecustomizerlib/customizeutils.go
@amritakohli
Copy link
Copy Markdown
Contributor

Can you please update / clean up the PR description?

}

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

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.

@ausgaonkar
Copy link
Copy Markdown
Contributor

Thanks for this change. LGTM! Once the merge happens, please also update the corresponding artifact.

Copy link
Copy Markdown
Member

@anphel31 anphel31 left a comment

Choose a reason for hiding this comment

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

Please fill out the PR description, and in particular ensure the "sudo make go-tidy-all and sudo make go-test-coverage" tests pass

@liulanze liulanze merged commit e0b3d80 into main Jan 16, 2024
@liulanze liulanze deleted the user/lanzeliu/verity-dracut-bugfix branch January 16, 2024 17:13
cwize1 pushed a commit that referenced this pull request Jan 18, 2024
cwize1 pushed a commit that referenced this pull request Jan 18, 2024
BettyRain pushed a commit that referenced this pull request Jan 23, 2024
#7234)

Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
BettyRain pushed a commit that referenced this pull request Jan 26, 2024
#7234)

Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
sharath-srikanth-chellappa pushed a commit that referenced this pull request Jan 26, 2024
#7234)

Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
sharath-srikanth-chellappa pushed a commit that referenced this pull request Jan 26, 2024
#7234)

Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
sharath-srikanth-chellappa pushed a commit that referenced this pull request Jan 26, 2024
#7234)

Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
BettyRain pushed a commit that referenced this pull request Jan 27, 2024
#7234)

Co-authored-by: lanzeliu <lanzeliu@microsoft.com>
Adub17030MS pushed a commit that referenced this pull request Feb 9, 2024
Xiaohong-Deng pushed a commit to Xiaohong-Deng/azurelinux that referenced this pull request Nov 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants