Skip to content

Merge mounts in FillDefault based on mountPoint instead of location #4046

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 22, 2025
+22 −24
Merged

Merge mounts in FillDefault based on mountPoint instead of location #4046

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions pkg/limayaml/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,21 +631,39 @@ func FillDefault(ctx context.Context, y, d, o *limatype.LimaYAML, filePath strin
// Combine all mounts; highest priority entry determines writable status.
// Only works for exact matches; does not normalize case or resolve symlinks.
mounts := make([]limatype.Mount, 0, len(d.Mounts)+len(y.Mounts)+len(o.Mounts))
location := make(map[string]int)
mountPoint := make(map[string]int)
for _, mount := range slices.Concat(d.Mounts, y.Mounts, o.Mounts) {
if out, err := executeHostTemplate(mount.Location, instDir, y.Param); err == nil {
mount.Location = filepath.Clean(out.String())
} else {
logrus.WithError(err).Warnf("Couldn't process mount location %q as a template", mount.Location)
}
if mount.MountPoint != nil {
// Expand a path that begins with `~`. Relative paths are not modified, and rejected by Validate() later.
if localpathutil.IsTildePath(mount.Location) {
if location, err := localpathutil.Expand(mount.Location); err == nil {
mount.Location = location
} else {
logrus.WithError(err).Warnf("Couldn't expand location %q", mount.Location)
}
}
if mount.MountPoint == nil {
mountLocation := mount.Location
if runtime.GOOS == "windows" {
var err error
mountLocation, err = ioutilx.WindowsSubsystemPath(ctx, mountLocation)
if err != nil {
logrus.WithError(err).Warnf("Couldn't convert location %q into mount target", mount.Location)
}
}
mount.MountPoint = ptr.Of(mountLocation)
} else {
if out, err := executeGuestTemplate(*mount.MountPoint, instDir, y.User, y.Param); err == nil {
mount.MountPoint = ptr.Of(out.String())
} else {
logrus.WithError(err).Warnf("Couldn't process mount point %q as a template", *mount.MountPoint)
}
}
if i, ok := location[mount.Location]; ok {
if i, ok := mountPoint[*mount.MountPoint]; ok {
if mount.SSHFS.Cache != nil {
mounts[i].SSHFS.Cache = mount.SSHFS.Cache
}
Expand Down Expand Up @@ -677,7 +695,7 @@ func FillDefault(ctx context.Context, y, d, o *limatype.LimaYAML, filePath strin
mounts[i].MountPoint = mount.MountPoint
}
} else {
location[mount.Location] = len(mounts)
mountPoint[*mount.MountPoint] = len(mounts)
mounts = append(mounts, mount)
}
}
Expand Down Expand Up @@ -713,26 +731,6 @@ func FillDefault(ctx context.Context, y, d, o *limatype.LimaYAML, filePath strin
mounts[i].NineP.Cache = ptr.Of(Default9pCacheForRO)
}
}

// Expand a path that begins with `~`. Relative paths are not modified, and rejected by Validate() later.
if localpathutil.IsTildePath(mount.Location) {
if location, err := localpathutil.Expand(mount.Location); err == nil {
mounts[i].Location = location
} else {
logrus.WithError(err).Warnf("Couldn't expand location %q", mount.Location)
}
}
if mount.MountPoint == nil {
mountLocation := mounts[i].Location
if runtime.GOOS == "windows" {
var err error
mountLocation, err = ioutilx.WindowsSubsystemPath(ctx, mountLocation)
if err != nil {
logrus.WithError(err).Warnf("Couldn't convert location %q into mount target", mounts[i].Location)
}
}
mounts[i].MountPoint = ptr.Of(mountLocation)
}
}

// Note: DNS lists are not combined; highest priority setting is picked
Expand Down
Loading