diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-25 13:37:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 13:37:59 -0400 |
| commit | a775e77cba3be5ec77738787f4346ff7e1d24462 (patch) | |
| tree | f50573eb3d9c42aa89a93b0a15298a0909fb38fe /pkg/domain | |
| parent | 9784d97bd6cef590de781575992f7a685ab1c2c2 (diff) | |
| parent | a615cb2fe22dbfb3ec0acc0e60d8f849301c3aac (diff) | |
| download | podman-a775e77cba3be5ec77738787f4346ff7e1d24462.tar.gz podman-a775e77cba3be5ec77738787f4346ff7e1d24462.tar.bz2 podman-a775e77cba3be5ec77738787f4346ff7e1d24462.zip | |
Merge pull request #13995 from ashley-cui/revrootful
Rootfull -> Rootful
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/abi/images.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go index 43440b594..74478b26d 100644 --- a/pkg/domain/infra/abi/images.go +++ b/pkg/domain/infra/abi/images.go @@ -367,7 +367,7 @@ func (ir *ImageEngine) Transfer(ctx context.Context, source entities.ImageScpOpt if rootless.IsRootless() && (len(dest.User) == 0 || dest.User == "root") { // if we are rootless and do not have a destination user we can just use sudo return transferRootless(source, dest, podman, parentFlags) } - return transferRootfull(source, dest, podman, parentFlags) + return transferRootful(source, dest, podman, parentFlags) } func (ir *ImageEngine) Tag(ctx context.Context, nameOrID string, tags []string, options entities.ImageTagOptions) error { @@ -785,8 +785,8 @@ func transferRootless(source entities.ImageScpOptions, dest entities.ImageScpOpt return cmdLoad.Run() } -// transferRootfull creates new podman processes using exec.Command and a new uid/gid alongside a cleared environment -func transferRootfull(source entities.ImageScpOptions, dest entities.ImageScpOptions, podman string, parentFlags []string) error { +// TransferRootful creates new podman processes using exec.Command and a new uid/gid alongside a cleared environment +func transferRootful(source entities.ImageScpOptions, dest entities.ImageScpOptions, podman string, parentFlags []string) error { basicCommand := []string{podman} basicCommand = append(basicCommand, parentFlags...) saveCommand := append(basicCommand, "save") |