feat: warn for signs of external mender installation #744
+25
−0
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
|
@TheMeaningfulEngineer, Let me know if you want to start the integration pipeline by mentioning me and the command "start pipeline". my commands and optionsYou can trigger a pipeline on multiple prs with:
You can start a fast pipeline, disabling full integration tests with:
You can trigger GitHub->GitLab branch sync with:
You can cherry pick to a given branch or branches with:
|
TheMeaningfulEngineer
force-pushed
the
probe-tainted-input-image
branch
from
628314c to
d723ff6
Compare
|
Merging these commits will result in the following changelog entries: Changelogsmender-convert (probe-tainted-input-image)New changes in mender-convert since master: Features
|
TheMeaningfulEngineer
force-pushed
the
probe-tainted-input-image
branch
2 times, most recently
from
01a77f9 to
3a30dc1
Compare
mender-convert doesn't handle well if the input image has Mender
installed already.
This could happen if someone did the installation of the Debian Mender package
and then attempted to mender-convert that image.
This introduces a function that will detect detect the potential issue
to aid troubleshooting from the logs once the error is hit.
With it you will see:
```
2025-02-18 18:06:44 [WARN] [mender-convert-modify] work/rootfs/var/lib/mender-monitor exists!
2025-02-18 18:06:44 [WARN] [mender-convert-modify] Input image contain traces Mender of previous Mender installation
2025-02-18 18:06:44 [WARN] [mender-convert-modify] The conversion might fail. Please provide a clean input image.
Extra WARN context is above
Below is old
2025-02-18 17:53:29 [INFO] [mender-convert-modify] Performing platform specific pre-modifications (if any)
2025-02-18 17:53:29 [INFO] [mender-convert-modify] Running hook: platform_pre_modify
2025-02-18 17:53:29 [INFO] [mender-convert-modify] Creating state folder in the data partition for Mender add-ons
mender-convert-modify has finished. Cleaning up...
2025-02-18 17:53:29 [ERROR] [mender-convert] mender-convert failed
2025-02-18 17:53:29 [DEBUG] [mender-convert-modify] When running: (./mender-convert-modify:174): run_and_
log_cmd():
sudo ln -sf /data/mender work/rootfs/var/lib
ln: work/rootfs/var/lib/mender: cannot overwrite directory
2025-02-18 17:53:29 [ERROR] [mender-convert] mender-convert failed
2025-02-18 17:53:29 [ERROR] [mender-convert] mender-convert exit code: 1
```
Changelog: title
Ticket: none
Signed-off-by: Alan <[email protected]>
TheMeaningfulEngineer
force-pushed
the
probe-tainted-input-image
branch
from
3a30dc1 to
9775c0d
Compare
| @@ -13,6 +13,29 @@ | |||
| # See the License for the specific language governing permissions and | |||
| # limitations under the License. | |||
|
|
|||
| # Checks there is no preexisting mender integration on the golden image | |||
| # | |||
| # mender-convert expects a vanilla image wihtout mender installed by other means. | |||
There was a problem hiding this comment.
Suggested change
| # mender-convert expects a vanilla image wihtout mender installed by other means. | |
| # mender-convert expects a vanilla image without mender installed by other means. |
| @@ -13,6 +13,29 @@ | |||
| # See the License for the specific language governing permissions and | |||
| # limitations under the License. | |||
|
|
|||
| # Checks there is no preexisting mender integration on the golden image | |||
There was a problem hiding this comment.
Suggested change
| # Checks there is no preexisting mender integration on the golden image | |
| # Checks if there is a preexisting mender integration on the golden image |
Comment on lines
+24
to
+36
| directories=( | ||
| "work/rootfs/var/lib/mender-monitor" | ||
| "work/rootfs/var/lib/mender-configure" | ||
| "work/data/mender" | ||
| ) | ||
|
|
||
| for dir in "${directories[@]}"; do | ||
| if [ -e "$dir" ]; then | ||
| log_warn "$dir exists!" | ||
| log_warn "Input image contain traces Mender of previous Mender installation" | ||
| log_warn "The conversion might fail. Please provide a clean input image." | ||
| fi | ||
| done |
There was a problem hiding this comment.
I would suggest something like this instead to avoid hardcoding the paths:
Suggested change
| directories=( | |
| "work/rootfs/var/lib/mender-monitor" | |
| "work/rootfs/var/lib/mender-configure" | |
| "work/data/mender" | |
| ) | |
| for dir in "${directories[@]}"; do | |
| if [ -e "$dir" ]; then | |
| log_warn "$dir exists!" | |
| log_warn "Input image contain traces Mender of previous Mender installation" | |
| log_warn "The conversion might fail. Please provide a clean input image." | |
| fi | |
| done | |
| directories="$(sudo find work/ -type d -name "mender*")" | |
| ## None of these should be present in a clean rootfs | |
| if [ -n "$directories" ]; then | |
| log_warn "Found following directories:\n$directories" | |
| log_warn "Input image contains traces of Mender" | |
| log_warn "The conversion might fail. Please provide a clean input image." | |
| fi |
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.
mender-convert doesn't handle well if the input image has Mender installed already.
This could happen if someone did the installation of the Debian Mender package and then attempted to mender-convert that image.
This introduces a function that will detect detect the potential issue to aid troubleshooting from the logs once the error is hit.
With it you will see:
External Contributor Checklist
🚨 Please review the guidelines for contributing to this repository.
The majority of our contributions are fixes, which means your commit should have
the form below:
git --signoff. Also note that the signoff author must match the author of the commit.Description
Please describe your pull request.
Thank you!