fix(network): do not make the implied default have the first priority - #412
Open
deepin-ci-robot wants to merge 1 commit into
Open
Conversation
Follow-up for b732606950f8726c0280080c7d055a714c2888f5 and 6706ce2fd2a13df0ae5e469b72d688eaf643dac4. If Network.ignore_carrier_loss_set flag is set, then the timeout value is always used, hence the logic implemented by b732606950f8726c0280080c7d055a714c2888f5 never worked. Changes: - Add debian/patches/fix-network-implied-default-priority.patch - Modify debian/patches/series - Modify debian/changelog Upstream: systemd/systemd@2743854 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
When
IgnoreCarrierLoss=is not explicitly configured in a.networkfile,network_verify()applied the implied default value and setignore_carrier_loss_set = trueat the same time. As a result,Network.ignore_carrier_loss_setwas always set and the timeout value was always used, so the logic implemented by b732606950f8 never worked (follow-up for b732606950f8726c0280080c7d055a714c2888f5 and 6706ce2fd2a13df0ae5e469b72d688eaf643dac4).What This PR Changes
Backport of upstream systemd commit 2743854540c2325ce025bdbdbab8c1a582c0ba0a: when applying the implied default in
network_verify(), no longer mark it as user-configured (drop theignore_carrier_loss_set = trueassignment), and correct the comment inlink_carrier_lost()to say the implied default value is used.Problem Solved After the Change
The implied default no longer has the first priority: when
IgnoreCarrierLoss=is not configured, the carrier-loss timeout logic behaves as originally intended instead of being permanently overridden by the implied default.Changes
Upstream
systemd/systemd@2743854 (PR #30761)
Generated-By: glm-5.3-flash
Co-Authored-By: deepin-ci-robot packages@deepin.org