conditionally add in cache to the image, allowing caching in customize image step

[benhoff]

Description

This reimplements this pull request, while fixing the edge case (hopefully). #8186

I don't have a bare metal device to test.

How Has This Been Tested?

Tested using docker

Checklist:

Please delete options that are not relevant.

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• My changes generate no new warnings
• Any dependent changes have been merged and published in downstream modules

[coderabbitai]

Walkthrough

The changes update the internal logic of the mount_chroot and umount_chroot functions within lib/functions/general/chroot-helpers.sh. The mount_chroot function now conditionally bind-mounts the host's /armbian/cache directory into the chroot at ${target}/armbian/cache if the source directory exists, and sets a flag file in the chroot to indicate the mount. The umount_chroot function checks for this flag and, if present, unmounts the cache bind and removes the flag. No function signatures or exported entities were altered.

Possibly related PRs

• Extend chroot mount helper to include cache directories #8186: Modifies the same mount_chroot and umount_chroot functions to add support for bind-mounting the host’s /armbian/cache directory into the chroot environment and properly unmounting it, indicating a direct code-level relationship.

Suggested labels

ready to merge

Suggested reviewers

• igorpecovnik

Note

⚡️ AI Code Reviews for VS Code, Cursor, Windsurf

CodeRabbit now has a plugin for VS Code, Cursor and Windsurf. This brings AI code reviews directly in the code editor. Each commit is reviewed immediately, finding bugs before the PR is raised. Seamless context handoff to your AI code agent ensures that you can easily incorporate review feedback.
Learn more here.

---

Note

⚡️ Faster reviews with caching

CodeRabbit now supports caching for code and dependencies, helping speed up reviews. This means quicker feedback, reduced wait times, and a smoother review experience overall. Cached data is encrypted and stored securely. This feature will be automatically enabled for all accounts on May 16th. To opt out, configure Review - Disable Cache at either the organization or repository level. If you prefer to disable all data retention across your organization, simply turn off the Data Retention setting under your Organization Settings.
Enjoy the performance boost—your workflow just got faster.

✨ Finishing Touches

• 📝 Generate Docstrings

🧪 Generate Unit Tests

• Create PR with Unit Tests
• Commit Unit Tests in branch cache
• Post Copyable Unit Tests in Comment

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Explain this complex logic.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai explain this code block.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and explain its main purpose.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai generate unit tests to generate unit tests for this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (2)

lib/functions/general/chroot-helpers.sh (2)

31-50: Make host cache path configurable and enforce idempotency.
Hard-coding /armbian/cache limits flexibility and risks double-mounting on repeated calls. Consider introducing an environment variable (e.g. ARMBIAN_CACHE_DIR) and checking for an existing mountpoint before binding:

local cache_src="${ARMBIAN_CACHE_DIR:-/armbian/cache}"
if [[ -d "$cache_src" ]]; then
    mkdir -p "${target}/armbian/cache"
    if ! mountpoint -q "${target}/armbian/cache" && mount --bind "$cache_src" "${target}/armbian/cache"; then
        touch "${target}/run/user/0/cache_mounted.flag"
    else
        display_alert "cache bind failed or already bound" "$cache_src → ${target}/armbian/cache" "warn"
    fi
else
    display_alert "Host cache not found — skipping cache mount" "" "warn"
fi

Use consistent indentation for readability.
The new block is indented with spaces, whereas the rest of the file uses tabs. Aligning to the existing tab-based style will keep the codebase uniform.

---

62-67: Prefer a mountpoint check over a flag file for cache unmount.
Rather than relying on cache_mounted.flag, you can directly test if the bind mount exists:

if mountpoint -q "${target}/armbian/cache"; then
    umount "${target}/armbian/cache" || true
fi

This removes the need for a temporary flag and handles state detection more robustly.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d0f708d and 40306d9.

📒 Files selected for processing (1)

• lib/functions/general/chroot-helpers.sh (3 hunks)

🔇 Additional comments (1)

lib/functions/general/chroot-helpers.sh (1)

19-19: Added debug logging for mount_chroot.
Logging the target at debug level will aid in tracing chroot mounts during development and troubleshooting.