Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #6986 from AkihiroSuda/cherrypick-6982-1.5
[release/1.5] archive: add human-readable hint to Lchown error
  • Loading branch information
estesp committed May 25, 2022
2 parents 6501621 + f67de00 commit ae4ec1f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions archive/tar.go
Expand Up @@ -19,6 +19,7 @@ package archive
import (
"archive/tar"
"context"
"fmt"
"io"
"os"
"path/filepath"
Expand All @@ -29,6 +30,7 @@ import (
"time"

"github.com/containerd/containerd/log"
"github.com/containerd/containerd/pkg/userns"
"github.com/containerd/continuity/fs"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -376,6 +378,10 @@ func createTarFile(ctx context.Context, path, extractDir string, hdr *tar.Header
// Lchown is not supported on Windows.
if runtime.GOOS != "windows" {
if err := os.Lchown(path, hdr.Uid, hdr.Gid); err != nil {
err = fmt.Errorf("failed to Lchown %q for UID %d, GID %d: %w", path, hdr.Uid, hdr.Gid, err)
if errors.Is(err, syscall.EINVAL) && userns.RunningInUserNS() {
err = fmt.Errorf("%w (Hint: try increasing the number of subordinate IDs in /etc/subuid and /etc/subgid)", err)
}
return err
}
}
Expand Down

0 comments on commit ae4ec1f

Please sign in to comment.