cmd/snap-bootstrap: no error when not input devices are found #8490
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
…dev/input Make the recovery chooser trigger service depend on /dev/input being non-empty. This will make systemd skip the service when there are no input devices. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
bboozzoo
force-pushed
the
bboozzoo/uc20-no-err-when-no-input
branch
from
d402a9b
to
b7a1b1d
Compare
There is no way to trigger the recovery when there are no matching input devices available in the system. This is not an error, so the exit status should still be 0. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
bboozzoo
force-pushed
the
bboozzoo/uc20-no-err-when-no-input
branch
from
b7a1b1d
to
706cac6
Compare
stolowski
approved these changes
Apr 14, 2020
| logger.Noticef("trigger not detected") | ||
| return nil | ||
| case triggerwatch.ErrNoMatchingInputDevices: | ||
| logger.Noticef("no matching input devices") |
There was a problem hiding this comment.
Perhaps you could log err string (also above) instead of explicit message?
There was a problem hiding this comment.
The logger is already set up to log to stderr or whichever other place that is correct in this context.
There was a problem hiding this comment.
Sorry, maybe I wasn't clear, what I meant is:
logger.Noticef("%s", err)
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.
Do not error out when no matching input devices are present. Also, tweak the snapd.recovery-chooser-trigger.service to start only when there are input devices at
/dev/input/event*.Related: https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1870212
cc @xnox