Skip to content

Commit

Permalink
Merge pull request #306 from salvete/main
Browse files Browse the repository at this point in the history
[EROFS] Add a check for erofs
  • Loading branch information
liulanzheng authored Oct 8, 2024
2 parents 0ec659d + a0492e7 commit db1d6fc
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion pkg/snapshot/overlay.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package snapshot

import (
"bytes"
"context"
"fmt"
"os"
Expand Down Expand Up @@ -1379,10 +1380,18 @@ func (o *snapshotter) blockPath(id string) string {
return filepath.Join(o.root, "snapshots", id, "block")
}

func IsErofsSupported() bool {
fs, err := os.ReadFile("/proc/filesystems")
if err != nil || !bytes.Contains(fs, []byte("\terofs\n")) {
return false
}
return true
}

func (o *snapshotter) turboOCIFsMeta(id string) (string, string) {
// TODO: make the priority order (multi-meta exists) configurable later if needed
erofsmeta := filepath.Join(o.root, "snapshots", id, "fs", "erofs.fs.meta")
if _, err := os.Stat(erofsmeta); err == nil {
if _, err := os.Stat(erofsmeta); err == nil && IsErofsSupported() {
return erofsmeta, "erofs"
}
return filepath.Join(o.root, "snapshots", id, "fs", "ext4.fs.meta"), "ext4"
Expand Down

0 comments on commit db1d6fc

Please sign in to comment.