Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/0.20] alpine: avoid wiping out writable host mounts under /home, etc #2244

Merged
merged 3 commits into from
Mar 12, 2024

Commits on Mar 11, 2024

  1. Bump alpine-lima image from 0.2.35 → 0.2.37

    * Fix parsing ssh keys as block string
    * Create a mount script instead of editing /etc/fstab
    * Make lima-init.sh yaml parsing more robust
    
    Signed-off-by: Jan Dubois <[email protected]>
    (cherry picked from commit 9a10748)
    Signed-off-by: Akihiro Suda <[email protected]>
    jandubois authored and AkihiroSuda committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    2522110 View commit details
    Browse the repository at this point in the history
  2. alpine: avoid wiping out writable host mounts under /home, etc.

    A host directory could be wiped out when all the following conditions are met:
    - The directory is mounted to Lima via virtiofs or 9p (reverse-sshfs is not affected)
    - The mount is writable
    - The mount point in the guest is under one of: /etc /home /root /usr/local /var/lib
    - The guest OS is Alpine Linux
    
    Fix issue 2221
    Fix rancher-sandbox/rancher-desktop issue 6582
    
    Co-authored-by: Jan Dubois <[email protected]>
    Signed-off-by: Akihiro Suda <[email protected]>
    (cherry picked from commit 795ada2)
    Signed-off-by: Akihiro Suda <[email protected]>
    AkihiroSuda and jandubois committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    2e9b83a View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Unmount MNTPNT before escaping quotes/backslashes

    The escaping is needed to print the string with quotes, but would break
    the umount command.
    
    Signed-off-by: Jan Dubois <[email protected]>
    (cherry picked from commit a782327)
    Signed-off-by: Akihiro Suda <[email protected]>
    jandubois authored and AkihiroSuda committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    c02b0f7 View commit details
    Browse the repository at this point in the history