diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-26 15:28:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 15:28:15 -0700 |
| commit | fe3acddcbe02cfa258170707791bd096dc909022 (patch) | |
| tree | 9a68b96d5f85adcc67189e97e1c788786c20b32c /cmd/podman/main_local.go | |
| parent | b6e2cbad0a4581a8fe4954ff4a9202461a526781 (diff) | |
| parent | f49e0c19ede56b1cc6b1d44ea9ba8b336cd22658 (diff) | |
| download | podman-fe3acddcbe02cfa258170707791bd096dc909022.tar.gz podman-fe3acddcbe02cfa258170707791bd096dc909022.tar.bz2 podman-fe3acddcbe02cfa258170707791bd096dc909022.zip | |
Merge pull request #2950 from giuseppe/podman-system-migrate
system: add new subcommand "migrate"
Diffstat (limited to 'cmd/podman/main_local.go')
| -rw-r--r-- | cmd/podman/main_local.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go index 91ad42630..5afd51e28 100644 --- a/cmd/podman/main_local.go +++ b/cmd/podman/main_local.go @@ -103,7 +103,7 @@ func profileOff(cmd *cobra.Command) error { } func setupRootless(cmd *cobra.Command, args []string) error { - if os.Geteuid() == 0 || cmd == _searchCommand || cmd == _versionCommand || cmd == _mountCommand || strings.HasPrefix(cmd.Use, "help") { + if os.Geteuid() == 0 || cmd == _searchCommand || cmd == _versionCommand || cmd == _mountCommand || cmd == _migrateCommand || strings.HasPrefix(cmd.Use, "help") { return nil } podmanCmd := cliconfig.PodmanCommand{ @@ -112,7 +112,7 @@ func setupRootless(cmd *cobra.Command, args []string) error { MainGlobalOpts, remoteclient, } - runtime, err := libpodruntime.GetRuntime(&podmanCmd) + runtime, err := libpodruntime.GetRuntime(getContext(), &podmanCmd) if err != nil { return errors.Wrapf(err, "could not get runtime") } |