[pull] main from containerd:main

.github/workflows/ci.yml

@@ -402,6 +402,41 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y criu
 
+      # "apt-get install erofs-utils" installs an older version (1.7.1 as of 2025-09-18)
+      # Build and install erofs-utils 1.8.8 from source to get a newer version
+      - name: Build and install erofs-utils from source
+        run: |
+          # Install dependencies
+          sudo apt-get update
+          sudo apt-get install -y wget make gcc libz-dev liblz4-dev libfuse-dev autoconf libtool pkg-config uuid-dev
+
+          # Create temporary build directory
+          BUILD_DIR="$(mktemp -d)"
+          cd "$BUILD_DIR"
+
+          # get erofs-utils-1.8.8.tar.gz
+          wget https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-1.8.8.tar.gz
+          tar -xzf erofs-utils-1.8.8.tar.gz
+          cd erofs-utils-1.8.8
+
+          # Build and install erofs-utils
+          ./autogen.sh
+          ./configure --enable-lz4 --enable-fuse --with-uuid
+          make -j"$(nproc)"
+          sudo make install
+          sudo ldconfig
+
+          # Clean up
+          cd -
+          rm -rf "$BUILD_DIR"
+
+          # Verify installation
+          mkfs.erofs --version
+
+      - name: Load EROFS kernel module
+        run: |
+          sudo modprobe erofs
+
       - name: Install containerd
         env:
           CGO_ENABLED: 1

core/snapshots/testsuite/issues.go

@@ -135,7 +135,9 @@ func checkRename(ss string) func(ctx context.Context, t *testing.T, sn snapshots
 		//
 		// It doesn't work on fuse-overlayfs either.
 		// https://github.com/containerd/fuse-overlayfs-snapshotter/pull/53#issuecomment-1543442048
-		case "overlayfs", "fuse-overlayfs":
+		//
+		// EROFS snapshotter also uses overlayfs and has the same limitation.
+		case "overlayfs", "fuse-overlayfs", "erofs":
 			// NOP
 		default:
 			applier = append(applier, fstest.Rename("/dir1", "/dir2"))