remote/client: implement udisks2-using write-files command #1219
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1219 +/- ##
========================================
- Coverage 62.7% 62.2% -0.6%
========================================
Files 163 164 +1
Lines 12051 12191 +140
========================================
+ Hits 7560 7584 +24
- Misses 4491 4607 +116 ☔ View full report in Codecov by Sentry. |
Emantor
requested review from
Bastian-Krause and
jluebbe
and removed request for
Bastian-Krause
2 tasks
|
Hi Ahmad, the idea for the feature looks great, however we would very much prefer a solution which uses the udisks2 DBus API with the agent interface. The regex may not work across versions and the DBus interface should be much more stable. |
|
The case-insensitive regexes are only used for error recovery and if they don't match, they would just bubble up the error. The only hard requirement is the |
a3f
force-pushed
the
write-files
branch
2 times, most recently
from
9fc5087
to
552a8d3
Compare
Emantor
previously approved these changes
Jul 14, 2023
write_image currently waits for only the block device to appear, even if the image should be written to a partition. Improve this a bit by polling for the partition itself to appear with a non-zero size. While at it, we refactor the code a bit to improve code reuse when we add the write_files method in the follow-up commit. Signed-off-by: Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com> Co-authored-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Bastian-Krause
force-pushed
the
write-files
branch
from
552a8d3
to
a1f791a
Compare
a3f
commented
Mar 24, 2024
|
Thanks, @Bastian-Krause! Changes look ok to me. |
While udisksctl exists as a client tool to talk to the udisks2 daemon, it's not well-suited for programmatic use. We thus introduce an agent that is copied to the remote system and that uses PyGObject to directly talk DBus to the daemon to mount and unmount file systems. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Bastian Krause <bst@pengutronix.de>
write_image, especially with the seek and skip parameters, can be useful for fast iterations during bootloader development: Only the bootloader is copied and the rest of the storage medium stays intact. Some boot firmware however loads subsequent boot stages from a, usually FAT32, filesystem, notably UEFI firmware from the EFI system partition. Make development on such targets easier by adding a write_files method that temporarily mounts the target device using udisks2 and writes the specified files there. Signed-off-by: Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com> Co-authored-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Bastian Krause <bst@pengutronix.de>
Analogously to write-image, add a write-file command that can be used to overwrite (or create anew) a single file in a file system located on a USBStorageDriver. This is useful for faster iteration during bootloader development when a bootloader is loaded from a file system. Following usages are supported: labgrid-client write-files a b # writes files a, b into /mnt/ labgrid-client write-files -t a b c # writes files b, c into /mnt/a/ labgrid-client write-files -T a b # writes file b to /mnt/a Where /mnt is some dynamic path on the, possibly remote, host exporting the USBStorageDriver. Signed-off-by: Stefan Wiehler <stefan.wiehler@missinglinkelectronics.com> Co-authored-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Bastian Krause <bst@pengutronix.de>
Bastian-Krause
force-pushed
the
write-files
branch
from
a1f791a
to
a712ee2
Compare
|
Fixups squashed. |
Bastian-Krause
approved these changes
Mar 25, 2024
Emantor
approved these changes
Mar 25, 2024
jluebbe
added a commit
to jluebbe/labgrid
that referenced
this pull request
Apr 9, 2024
Otherwise, udisks2 and gi are needed for all installations, even if write_files is never used. Fixes: labgrid-project#1219 Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
jluebbe
added a commit
to jluebbe/labgrid
that referenced
this pull request
Apr 9, 2024
Otherwise, udisks2 and gi are needed for all installations, even if write_files is never used. Fixes: labgrid-project#1219 Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
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.
Description
Adds a
write-filesclient command to copy files onto mass storage. This is useful for bootloader development for processors with bootroms that load code from file systems (e.g. EFI system partition, OMAP, AT91, Zynq, Raspberry ... etc.). The user interface tries to reproduce the semantics of the UNIXcpcommand as much as possible.As of now, we can only copy individual files, but not recursively on directories; in the future we might want to extend the
ManagedFileclass to support this use case as well.This is mostly based on @sephalon's #548, with some sprinkles of my #820, but with
udisksctlinstead ofpmount.How to test
Checklist
The arguments and description indoc/configuration.rst have been updated