fix(pcrlock): use .d path for PCRLOCK_KERNEL_*_PATH - #415
Open
deepin-ci-robot wants to merge 1 commit into
Open
Conversation
Fix the path for the generated.pcrlock files for the cmdline and initrd
cases. Without it the tool complains with:
Failed to parse component file /var/lib/pcrlock.d/720-kernel-initrd.pcrlock, ignoring: Is a directory
Changes:
- Add debian/patches/fix-pcrlock-use-d-path-for-kernel-pcrlock.patch
- Modify debian/patches/series
- Modify debian/changelog
Upstream: systemd/systemd@ef94944
Generated-By: glm-5.3-flash
Co-Authored-By: deepin-ci-robot <packages@deepin.org>
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot TAG: 255.2-4deepin68 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem Before the Change
systemd-pcrlockused incorrect paths for the generated kernel cmdline / initrd component files:PCRLOCK_KERNEL_CMDLINE_PATHandPCRLOCK_KERNEL_INITRD_PATHpointed to.../710-kernel-cmdline.pcrlock/generated.pcrlockand.../720-kernel-initrd.pcrlock/generated.pcrlockinstead of the.pcrlock.ddirectories used by all other generated components. The tool then fails with:What This PR Changes
PCRLOCK_KERNEL_CMDLINE_PATHandPCRLOCK_KERNEL_INITRD_PATHinsrc/pcrlock/pcrlock.cto use the.pcrlock.dpath suffix, consistent with the other component paths.Problem Solved After the Change
systemd-pcrlockno longer treats/var/lib/pcrlock.d/720-kernel-initrd.pcrlockas a stray directory and correctly reads/writes the generated kernel cmdline and initrd pcrlock component files.Changes
Upstream