Skip to content

fix: don't mix up runtimedir and metadir #44

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
Aug 12, 2025
Merged

fix: don't mix up runtimedir and metadir #44

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
27 changes: 18 additions & 9 deletions pkg/molecule/molecule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,31 @@ type Molecule struct {
config MountOCIOpts
}

func (m Molecule) MetadataPath() (string, error) {
// MetadataDir: Return a metadir for this molecule.
// Returns:
//
// the base runtime dir (e.g. /run/atomfs),
// the full metadata path (e.g. /run/atomfs/meta/NSNAME/expanded-path)
// error
func (m Molecule) MetadataPath() (string, string, error) {

mountNSName, err := common.GetMountNSName()
if err != nil {
return "", err
return "", "", err
}
absTarget, err := filepath.Abs(m.config.Target)
if err != nil {
return "", err
return "", "", err
}
metadir := filepath.Join(common.RuntimeDir(m.config.MetadataDir), "meta", mountNSName, common.ReplacePathSeparators(absTarget))
return metadir, nil
runtimedir := common.RuntimeDir(m.config.MetadataDir)

metadir := filepath.Join(runtimedir, "meta", mountNSName, common.ReplacePathSeparators(absTarget))

return runtimedir, metadir, nil
}

func (m Molecule) MountedAtomsPath(parts ...string) (string, error) {
metapath, err := m.MetadataPath()
_, metapath, err := m.MetadataPath()
if err != nil {
return "", err
}
Expand Down Expand Up @@ -193,7 +202,7 @@ var OverlayMountOptions = "index=off,xino=on,userxattr"
// Mount mounts an overlay at dest, with writeable overlay as per m.config
func (m Molecule) Mount(dest string) error {

metadir, err := m.MetadataPath()
_, metadir, err := m.MetadataPath()
if err != nil {
return errors.Wrapf(err, "can't find metadata path")
}
Expand Down Expand Up @@ -318,7 +327,7 @@ func UmountWithMetadir(dest, metadirArg string) error {
},
}

metadir, err := mol.MetadataPath()
runtimedir, metadir, err := mol.MetadataPath()
if err != nil {
return errors.WithStack(err)
}
Expand Down Expand Up @@ -423,7 +432,7 @@ func UmountWithMetadir(dest, metadirArg string) error {
if err != nil {
return err
}
destMetaDir := filepath.Join(common.RuntimeDir(metadir), "meta", mountNSName, common.ReplacePathSeparators(dest))
destMetaDir := filepath.Join(common.RuntimeDir(runtimedir), "meta", mountNSName, common.ReplacePathSeparators(dest))
if err := os.RemoveAll(destMetaDir); err != nil {
return err
}
Expand Down
Loading