Skip to content

Conversation

Copy link

Copilot AI commented Nov 18, 2025

Merge conflicts existed in the passthrough filesystem between bind mount support and UID/GID mapping features.

Changes

config.rs

  • Added both bind_mounts: HashMap<PathBuf, BindMount> and mapping: IdMappings fields to Config struct
  • Removed duplicate imports

async_io.rs

  • Adopted refactored do_mkdir_inner() and do_create_inner() helper methods for flexibility
  • Preserved readonly bind mount permission checks via check_write_permission()

passthrough_example.rs

  • Combined CLI arguments: --bind for bind mounts, --options for UID/GID mappings
  • Both features initialize through unified Config struct

mod.rs

  • Removed duplicate Path import

Result

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.

Copilot AI changed the title [WIP] Fix merge conflicts in the codebase Resolve merge conflicts in passthrough filesystem implementation Nov 18, 2025
Copilot AI requested a review from LangQi99 November 18, 2025 04:55
@LangQi99 LangQi99 marked this pull request as ready for review November 18, 2025 05:13
@LangQi99 LangQi99 merged commit 57e79f2 into bind-tmp Nov 18, 2025
1 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants