aboutsummaryrefslogtreecommitdiff
path: root/pkg/domain/infra/abi/images.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-04-22 06:56:33 -0400
committerGitHub <noreply@github.com>2022-04-22 06:56:33 -0400
commit0d6af1438710acc03ef9e7395e1bc8ecf46f4294 (patch)
tree14341c3d033e132c426c14cd2cf2f5618d4ec044 /pkg/domain/infra/abi/images.go
parent1fcefc94f9e3e6d9dedeccc83fa3964461519b7f (diff)
parentcc3790f332d989440eb1720e24e3619fc97c74ee (diff)
downloadpodman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.tar.gz
podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.tar.bz2
podman-0d6af1438710acc03ef9e7395e1bc8ecf46f4294.zip
Merge pull request #13964 from rhatdan/rootfull
Switch all rootful to rootfull
Diffstat (limited to 'pkg/domain/infra/abi/images.go')
-rw-r--r--pkg/domain/infra/abi/images.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 74478b26d..43440b594 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 transferRootful(source, dest, podman, parentFlags)
+ return transferRootfull(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()
}
-// 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 {
+// 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 {
basicCommand := []string{podman}
basicCommand = append(basicCommand, parentFlags...)
saveCommand := append(basicCommand, "save")