opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7481 from Luap99/keep-conf

Browse Source 
Don't remove config files with podman system reset
This commit is contained in:
OpenShift Merge Robot
2020-08-28 15:59:47 -04:00
committed by GitHub
parent 1f9b854c23 b84ddc2535
commit c069e0bad9
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libpod/reset.go
View File

@ -2,12 +2,14 @@ package libpod
import ( import (
"context" "context"
"fmt"
"os" "os"
"path/filepath" "path/filepath"
"github.com/containers/podman/v2/libpod/define" "github.com/containers/podman/v2/libpod/define"
"github.com/containers/podman/v2/pkg/rootless" "github.com/containers/podman/v2/pkg/rootless"
"github.com/containers/podman/v2/pkg/util" "github.com/containers/podman/v2/pkg/util"
"github.com/containers/storage"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -103,14 +105,16 @@ func (r *Runtime) Reset(ctx context.Context) error {
prevError = err prevError = err
} }
if rootless.IsRootless() { if storageConfPath, err := storage.DefaultConfigFile(rootless.IsRootless()); err == nil {
configPath := filepath.Join(os.Getenv("HOME"), ".config/containers") if _, err = os.Stat(storageConfPath); err == nil {
if err := os.RemoveAll(configPath); err != nil { fmt.Printf("A storage.conf file exists at %s\n", storageConfPath)
if prevError != nil { fmt.Println("You should remove this file if you did not modified the configuration.")
logrus.Error(prevError)
}
prevError = err
} }
} else {
if prevError != nil {
logrus.Error(prevError)
}
prevError = err
} }
return prevError return prevError