Resolve merge conflicts in passthrough filesystem implementation #1
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.
Merge conflicts existed in the passthrough filesystem between bind mount support and UID/GID mapping features.
Changes
config.rsbind_mounts: HashMap<PathBuf, BindMount>andmapping: IdMappingsfields toConfigstructasync_io.rsdo_mkdir_inner()anddo_create_inner()helper methods for flexibilitycheck_write_permission()passthrough_example.rs--bindfor bind mounts,--optionsfor UID/GID mappingsConfigstructmod.rsPathimportResult
Both features now coexist. Example usage:
passthrough_example \ --mountpoint /mnt \ --rootdir /source \ --bind volumes:/host/volumes \ --bind data:/host/data:ro \ --options "uidmapping=1000:0:1,gidmapping=1000:0:1"Original prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.