summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-21 05:54:57 -0400
committerGitHub <noreply@github.com>2020-07-21 05:54:57 -0400
commitdf6920aa79073b2767d24c6524367384b6284b31 (patch)
treeb56fdbd8b13f4edf3c3e0638b0f970533157d50b /cmd
parent1682e60dac14d9f32ae02c5f3286b3309cd9b128 (diff)
parent841eac0af651d7afa4749a65f4e773815b5c715c (diff)
downloadpodman-df6920aa79073b2767d24c6524367384b6284b31.tar.gz
podman-df6920aa79073b2767d24c6524367384b6284b31.tar.bz2
podman-df6920aa79073b2767d24c6524367384b6284b31.zip
Merge pull request #7009 from rhatdan/containers.conf
Switch references from libpod.conf to containers.conf
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/registry/config.go2
-rw-r--r--cmd/podman/system/renumber.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go
index 75e67b35d..a7e368115 100644
--- a/cmd/podman/registry/config.go
+++ b/cmd/podman/registry/config.go
@@ -70,7 +70,7 @@ func newPodmanConfig() {
// setXdgDirs ensures the XDG_RUNTIME_DIR env and XDG_CONFIG_HOME variables are set.
// containers/image uses XDG_RUNTIME_DIR to locate the auth file, XDG_CONFIG_HOME is
-// use for the libpod.conf configuration file.
+// use for the containers.conf configuration file.
func setXdgDirs() error {
if !rootless.IsRootless() {
return nil
diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go
index 82cf65d8f..7cec5b986 100644
--- a/cmd/podman/system/renumber.go
+++ b/cmd/podman/system/renumber.go
@@ -18,7 +18,7 @@ var (
podman system renumber
Migrate lock numbers to handle a change in maximum number of locks.
- Mandatory after the number of locks in libpod.conf is changed.
+ Mandatory after the number of locks in containers.conf is changed.
`
renumberCommand = &cobra.Command{