opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8750 from rhatdan/reset

Browse Source 
Don't accidently remove XDG_RUNTIME_DIR when reseting storage
This commit is contained in:
OpenShift Merge Robot
2020-12-17 12:05:33 +00:00
committed by GitHub
parent 915ae6d9bf 82424aa007
commit c38ae47a1a
1 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libpod/reset.go
View File

@ -77,18 +77,35 @@ func (r *Runtime) Reset(ctx context.Context) error {
} }
} }
xdgRuntimeDir := filepath.Clean(os.Getenv("XDG_RUNTIME_DIR"))
_, prevError := r.store.Shutdown(true) _, prevError := r.store.Shutdown(true)
if err := os.RemoveAll(r.store.GraphRoot()); err != nil { graphRoot := filepath.Clean(r.store.GraphRoot())
if graphRoot == xdgRuntimeDir {
if prevError != nil { if prevError != nil {
logrus.Error(prevError) logrus.Error(prevError)
} }
prevError = err prevError = errors.Errorf("failed to remove runtime graph root dir %s, since it is the same as XDG_RUNTIME_DIR", graphRoot)
} else {
if err := os.RemoveAll(graphRoot); err != nil {
if prevError != nil {
logrus.Error(prevError)
}
prevError = err
}
} }
if err := os.RemoveAll(r.store.RunRoot()); err != nil { runRoot := filepath.Clean(r.store.RunRoot())
if runRoot == xdgRuntimeDir {
if prevError != nil { if prevError != nil {
logrus.Error(prevError) logrus.Error(prevError)
} }
prevError = err prevError = errors.Errorf("failed to remove runtime root dir %s, since it is the same as XDG_RUNTIME_DIR", runRoot)
} else {
if err := os.RemoveAll(runRoot); err != nil {
if prevError != nil {
logrus.Error(prevError)
}
prevError = err
}
} }
runtimeDir, err := util.GetRuntimeDir() runtimeDir, err := util.GetRuntimeDir()
if err != nil { if err != nil {
@ -98,13 +115,19 @@ func (r *Runtime) Reset(ctx context.Context) error {
if tempDir == runtimeDir { if tempDir == runtimeDir {
tempDir = filepath.Join(tempDir, "containers") tempDir = filepath.Join(tempDir, "containers")
} }
if err := os.RemoveAll(tempDir); err != nil { if filepath.Clean(tempDir) == xdgRuntimeDir {
if prevError != nil { if prevError != nil {
logrus.Error(prevError) logrus.Error(prevError)
} }
prevError = err prevError = errors.Errorf("failed to remove runtime tmpdir %s, since it is the same as XDG_RUNTIME_DIR", tempDir)
} else {
if err := os.RemoveAll(tempDir); err != nil {
if prevError != nil {
logrus.Error(prevError)
}
prevError = err
}
} }
if storageConfPath, err := storage.DefaultConfigFile(rootless.IsRootless()); err == nil { if storageConfPath, err := storage.DefaultConfigFile(rootless.IsRootless()); err == nil {
if _, err = os.Stat(storageConfPath); err == nil { if _, err = os.Stat(storageConfPath); err == nil {
fmt.Printf("A storage.conf file exists at %s\n", storageConfPath) fmt.Printf("A storage.conf file exists at %s\n", storageConfPath)