Skip to content

Commit

Permalink
overlay: do not recreate "merged" dir
Browse files Browse the repository at this point in the history
after the commit "overlay: replace rmdir with rename", it is safe to
assume it is never deleted.

Closes: containers#1827

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
  • Loading branch information
giuseppe committed Feb 15, 2024
1 parent 586641d commit ea1c353
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions drivers/overlay/overlay.go
Original file line number Diff line number Diff line change
Expand Up @@ -1700,10 +1700,6 @@ func (d *Driver) get(id string, disableShifting bool, options graphdriver.MountO
}

mergedDir := path.Join(workDirBase, "merged")
// Create the driver merged dir
if err := idtools.MkdirAs(mergedDir, 0o700, rootUID, rootGID); err != nil && !os.IsExist(err) {
return "", err
}
if count := d.ctr.Increment(mergedDir); count > 1 {
return mergedDir, nil
}
Expand Down

0 comments on commit ea1c353

Please sign in to comment.