Ignore empty dtoverlay coming from target state #2269
Draft
Conversation
This file contains 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
Before v16, the supervisor would incorrectly interpret an empty dtoverlay in config.txt (i.e. a line with `dtoverlay=`) as a proper variable and create it as config var if found on config.txt before provisioning. With the latest supervisor, an empty dtoverlay on config.txt is interpreted in the [correct way](https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay), but that makes an empty dtoverlay on the target state meaningless, leading to looping behavior as the current and target state won't match. This PR modifies the pre-processing function to filter out empty array variables before the comparison, to prevent this sort of looping behavior. This allows empty dtoverlay to be ignored. Change-type: patch
pipex
commented
Apr 11, 2024
| @@ -33,6 +33,7 @@ export function envToBootConfig( | |||
| .mapValues((val, key) => | |||
| configBackend.processConfigVarValue(key, val || ''), | |||
| ) | |||
| .pickBy((val) => !Array.isArray(val) || val.length > 0) | |||
There was a problem hiding this comment.
From what I saw on the other config backends, this should have no impact as the config.txt backend is the only one that returns an empty array
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Before v16, the supervisor would incorrectly interpret an empty dtoverlay in config.txt (i.e. a line with
dtoverlay=) as a proper variable and create it as config var if found on config.txt before provisioning. With the latest supervisor, an empty dtoverlay on config.txt is interpreted in the correct way, but that makes an empty dtoverlay on the target state meaningless, leading to looping behavior as the current and target state won't match.This PR modifies the pre-processing function to filter out empty array variables before the comparison, to prevent this sort of looping behavior. This allows empty dtoverlay to be ignored.
Change-type: patch