Skip to content

Remove duplicate systemd parameters from kernel-mshv cfg#5733

Merged
Camelron merged 1 commit into
mainfrom
cameronbaird/dedup-systemd-cmd-mshv
Jun 23, 2023
Merged

Remove duplicate systemd parameters from kernel-mshv cfg#5733
Camelron merged 1 commit into
mainfrom
cameronbaird/dedup-systemd-cmd-mshv

Conversation

@Camelron

@Camelron Camelron commented Jun 22, 2023

Copy link
Copy Markdown
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?
When booting, grub should still be getting its systemd-related parameters from one place: systemd.cfg which is packaged in systemd.rpm. Prevent the kernel-mshv package from stomping over these settings.

Change Log
  • Remove "net.ifnames=0 plymouth.enable=0 systemd.legacy_systemd_cgroup_controller=yes systemd.unified_cgroup_hierarchy=0" from $kernel_cmdline_mshv
Does this affect the toolchain?

NO

Associated issues
Test Methodology

@Camelron Camelron requested a review from a team as a code owner June 22, 2023 20:52
@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label Jun 22, 2023
@Camelron

Copy link
Copy Markdown
Author

Tested locally, works!

@Camelron Camelron merged commit 36ca056 into main Jun 23, 2023
@Camelron Camelron deleted the cameronbaird/dedup-systemd-cmd-mshv branch June 23, 2023 18:55
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.

4 participants