diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-28 15:59:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 15:59:47 -0400 |
| commit | c069e0bad9f4aa8da98c46d702f450ce41da6346 (patch) | |
| tree | 8faa2400f2f9d2fa5f48bea659ef8bd151dbaf0b | |
| parent | 1f9b854c239d310fee7606b1ef21cb046e30825b (diff) | |
| parent | b84ddc2535d05d2fb2422ca5f6bc2abac2dd36da (diff) | |
| download | podman-c069e0bad9f4aa8da98c46d702f450ce41da6346.tar.gz podman-c069e0bad9f4aa8da98c46d702f450ce41da6346.tar.bz2 podman-c069e0bad9f4aa8da98c46d702f450ce41da6346.zip | |
Merge pull request #7481 from Luap99/keep-conf
Don't remove config files with podman system reset
| -rw-r--r-- | libpod/reset.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/libpod/reset.go b/libpod/reset.go index cae4d3a04..f8828fed4 100644 --- a/libpod/reset.go +++ b/libpod/reset.go @@ -2,12 +2,14 @@ package libpod import ( "context" + "fmt" "os" "path/filepath" "github.com/containers/podman/v2/libpod/define" "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/podman/v2/pkg/util" + "github.com/containers/storage" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -103,14 +105,16 @@ func (r *Runtime) Reset(ctx context.Context) error { prevError = err } - if rootless.IsRootless() { - configPath := filepath.Join(os.Getenv("HOME"), ".config/containers") - if err := os.RemoveAll(configPath); err != nil { - if prevError != nil { - logrus.Error(prevError) - } - prevError = err + if storageConfPath, err := storage.DefaultConfigFile(rootless.IsRootless()); err == nil { + if _, err = os.Stat(storageConfPath); err == nil { + fmt.Printf("A storage.conf file exists at %s\n", storageConfPath) + fmt.Println("You should remove this file if you did not modified the configuration.") } + } else { + if prevError != nil { + logrus.Error(prevError) + } + prevError = err } return prevError |